---

yaml --- r: 32255 b: refs/heads/master c: 4a14cf4 h: refs/heads/master i: 32253: be9b474 32251: 92e37d1 32247: 86dd2b0 32239: 0b08612 32223: 5636997 32191: 772dbcc 32127: 2045542 31999: ed5d477 31743: 8db48ef v: v3
git-mirror · Jul 10, 2006 · fda1357 · fda1357
1 parent 5e9cef3
commit fda1357
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e154ff3d2c5ad313ef0c66e6217502361cad2799
+refs/heads/master: 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08
diff --git a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -129,9 +129,6 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 	if (strncmp(np->name, "i2s-", 4))
 		return 0;
 
-	if (macio_irq_count(macio) != 3)
-		return 0;
-
 	dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);
 	if (!dev)
 		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);
 	}
 	for (i=0;i<3;i++) {
-		if (request_irq(macio_irq(macio, i), ints[i], 0,
-				dev->rnames[i], dev))
+		int irq = irq_of_parse_and_map(np, i);
+		if (request_irq(irq, ints[i], 0, dev->rnames[i], dev))
 			goto err;
-		dev->interrupts[i] = macio_irq(macio, i);
+		dev->interrupts[i] = irq;
 	}
 
 	for (i=0;i<3;i++) {