[ALSA] sound/ppc/pmac.c typo
Stelian Pop [Fri, 20 Jan 2006 13:44:41 +0000 (14:44 +0100)]
Modules: PPC PMAC driver

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: Takashi Iwai <tiwai@suse.de>

sound/ppc/pmac.c

index a642e4c..4988f87 100644 (file)
@@ -1216,7 +1216,7 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                        goto __error;
                }
                for (i = 0; i < 3; i ++) {
-                       if (of_address_to_resource(np->parent, i,
+                       if (of_address_to_resource(np, i,
                                                   &chip->rsrc[i])) {
                                printk(KERN_ERR "snd: can't translate rsrc "
                                       " %d (%s)\n", i, rnames[i]);