Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88356e90 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[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: default avatarStelian Pop <stelian@popies.net>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9cd68455

sound/ppc/pmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);