diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-30 00:54:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-08 22:51:22 -0500 |
commit | bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0 (patch) | |
tree | 97b0acaade2d32ddb37147ff5112318f6c292cf8 /drivers/macintosh/via-pmu.c | |
parent | 54b9a9aedc990dd2aefc45ab16d84f245cb7d8d0 (diff) |
[PATCH] powerpc: udbg updates
The udbg low level io layer has an issue with udbg_getc() returning a
char (unsigned on ppc) instead of an int, thus the -1 if you had no
available input device could end up turned into 0xff, filling your
display with bogus characters. This fixes it, along with adding a little
blob to xmon to do a delay before exiting when getting an EOF and fixing
the detection of ADB keyboards in udbg_adb.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
-rw-r--r-- | drivers/macintosh/via-pmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 13881f199607..d6dabee55f2f 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -313,7 +313,7 @@ int __init find_via_pmu(void) | |||
313 | goto fail; | 313 | goto fail; |
314 | } | 314 | } |
315 | taddr = of_translate_address(vias, reg); | 315 | taddr = of_translate_address(vias, reg); |
316 | if (taddr == 0) { | 316 | if (taddr == OF_BAD_ADDR) { |
317 | printk(KERN_ERR "via-pmu: Can't translate address !\n"); | 317 | printk(KERN_ERR "via-pmu: Can't translate address !\n"); |
318 | goto fail; | 318 | goto fail; |
319 | } | 319 | } |
@@ -376,7 +376,7 @@ int __init find_via_pmu(void) | |||
376 | return 0; | 376 | return 0; |
377 | } | 377 | } |
378 | 378 | ||
379 | printk(KERN_INFO "PMU driver %d initialized for %s, firmware: %02x\n", | 379 | printk(KERN_INFO "PMU driver v%d initialized for %s, firmware: %02x\n", |
380 | PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version); | 380 | PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version); |
381 | 381 | ||
382 | sys_ctrler = SYS_CTRLER_PMU; | 382 | sys_ctrler = SYS_CTRLER_PMU; |