[PATCH] powermac: Fix some 64b resource damage
The 64 bits resource patches did a bit of damage on PowerMac causing a buffer overflow in macio_asic and a warning in a sound driver. The former is fixed by reverting the sprintf of the bus_id to %08x as it was before. The bus_id used for macio devices is always a 32 bits value (macio always sits in 32 bits space) and since it's exposed to userland, the format of the string shouldn't be changed like that anyway. The second by using the proper type for printk. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
fc25465f09
commit
d63fb6c55f
@@ -1170,7 +1170,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
|
||||
chip->rsrc[i].start + 1,
|
||||
rnames[i]) == NULL) {
|
||||
printk(KERN_ERR "snd: can't request rsrc "
|
||||
" %d (%s: 0x%016lx:%016lx)\n",
|
||||
" %d (%s: 0x%016llx:%016llx)\n",
|
||||
i, rnames[i],
|
||||
(unsigned long long)chip->rsrc[i].start,
|
||||
(unsigned long long)chip->rsrc[i].end);
|
||||
|
Reference in New Issue
Block a user