aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-02-01 06:04:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 11:53:09 -0500
commit88356e908521a84b2220c9e8850d1a356a851aa9 (patch)
tree12d83c6ab84ec41a6903207e8042e9081a25d30d
parent9cd684551124e71630ab96d238747051463f5b56 (diff)
[PATCH] sound/ppc/pmac.c typo
In 2.6.16-rc1 there is a small typo introduced by the 'Remove device_node addrs/n_addr' changes which prevents my Powerbook G4 sound from working: Advanced Linux Sound Architecture Driver Version 1.0.11rc2 (Wed Jan 04 08:57:20 2006 UTC). snd: can't request rsrc 0 (Sound Control: 0x80000000:80004fff) ALSA device list: No soundcards found. The patch below fixes it. Of course, the patch fixing the i2c issues ('i2c_smbus_write_i2c_block_data' patch) needs to be applied to in order for the sound to completly work. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/ppc/pmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index a642e4cfcf45..4988f873a7ba 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1216,7 +1216,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
1216 goto __error; 1216 goto __error;
1217 } 1217 }
1218 for (i = 0; i < 3; i ++) { 1218 for (i = 0; i < 3; i ++) {
1219 if (of_address_to_resource(np->parent, i, 1219 if (of_address_to_resource(np, i,
1220 &chip->rsrc[i])) { 1220 &chip->rsrc[i])) {
1221 printk(KERN_ERR "snd: can't translate rsrc " 1221 printk(KERN_ERR "snd: can't translate rsrc "
1222 " %d (%s)\n", i, rnames[i]); 1222 " %d (%s)\n", i, rnames[i]);