diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-07-02 03:55:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 05:11:56 +0200 |
| commit | d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc (patch) | |
| tree | 8e2d3ff8deef62cf64f3989d5f6804feaa3753fe /sound/ppc/pmac.c | |
| parent | Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc.tar.xz linux-d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc.zip | |
[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>
Diffstat (limited to 'sound/ppc/pmac.c')
| -rw-r--r-- | sound/ppc/pmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index be98f6377339..90db9a1d1e0a 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -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); |