diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-30 16:54:12 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-01-09 14:51:22 +1100 |
| commit | bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0 (patch) | |
| tree | 97b0acaade2d32ddb37147ff5112318f6c292cf8 /drivers/macintosh | |
| parent | [PATCH] powerpc: powermac adb fix udbg_adb_use_btext warning (diff) | |
| download | linux-dev-bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0.tar.xz linux-dev-bb6b9b28d6847bc71f910e2e82c9040ff4b97ec0.zip | |
[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')
| -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) goto fail; } taddr = of_translate_address(vias, reg); - if (taddr == 0) { + if (taddr == OF_BAD_ADDR) { printk(KERN_ERR "via-pmu: Can't translate address !\n"); goto fail; } @@ -376,7 +376,7 @@ int __init find_via_pmu(void) return 0; } - printk(KERN_INFO "PMU driver %d initialized for %s, firmware: %02x\n", + printk(KERN_INFO "PMU driver v%d initialized for %s, firmware: %02x\n", PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version); sys_ctrler = SYS_CTRLER_PMU; |