diff options
| author | Nye Liu <nyet@mrv.com> | 2008-06-27 13:01:00 -0700 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-14 07:55:35 -0500 |
| commit | 5e82eb333949e2f1652bf70d36dfaa875306ae11 (patch) | |
| tree | 1f942039e5ff2b815ec137de3a7a4a6821647166 | |
| parent | a3083220c089c626a66b66af0eff4f9220d5b797 (diff) | |
| download | linux-5e82eb333949e2f1652bf70d36dfaa875306ae11.tar.bz2 | |
powerpc/CPM: Minor cosmetic changes to udbg_putc
udbg_putc is a *function pointer* that is initialized during
udbg_init_cpm. It might not be initialized properly when called from
udbg_putc_cpm(), so (recursively) call udbg_putc_cpm() directly.
Signed-off-by: Nye Liu <nyet@mrv.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/sysdev/cpm_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 9b75d164bdf9..e4b7296acb2c 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c @@ -37,7 +37,7 @@ static void udbg_putc_cpm(char c) u8 __iomem *txbuf = (u8 __iomem __force *)in_be32(&cpm_udbg_txdesc[1]); if (c == '\n') - udbg_putc('\r'); + udbg_putc_cpm('\r'); while (in_be32(&cpm_udbg_txdesc[0]) & 0x80000000) ; @@ -53,7 +53,6 @@ void __init udbg_init_cpm(void) setbat(1, 0xf0000000, 0xf0000000, 1024*1024, _PAGE_IO); #endif udbg_putc = udbg_putc_cpm; - udbg_putc('X'); } } #endif |