redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] Fix snd-aoa irq conversion

Browse source 
Use proper irq mapping interface for snd-aoa-i2sbus.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andreas Schwab 2006-07-10 04:44:33 -07:00 committed by Linus Torvalds
parent e154ff3d2c
commit 4a14cf4508
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/aoa/soundbus/i2sbus/i2sbus-core.c
View file

@ -129,9 +129,6 @@ static int i2sbus_add_dev(struct macio_dev *macio,
if (strncmp(np->name, "i2s-", 4)) if (strncmp(np->name, "i2s-", 4))
return 0; return 0;
if (macio_irq_count(macio) != 3)
return 0;
dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL); dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);
if (!dev) if (!dev)
return 0; return 0;
@ -183,10 +180,10 @@ static int i2sbus_add_dev(struct macio_dev *macio,
snprintf(dev->rnames[i], sizeof(dev->rnames[i]), rnames[i], np->name); snprintf(dev->rnames[i], sizeof(dev->rnames[i]), rnames[i], np->name);
} }
for (i=0;i<3;i++) { for (i=0;i<3;i++) {
if (request_irq(macio_irq(macio, i), ints[i], 0, int irq = irq_of_parse_and_map(np, i);
dev->rnames[i], dev)) if (request_irq(irq, ints[i], 0, dev->rnames[i], dev))
goto err; goto err;
dev->interrupts[i] = macio_irq(macio, i); dev->interrupts[i] = irq;
} }
for (i=0;i<3;i++) { for (i=0;i<3;i++) {