---

yaml --- r: 261882 b: refs/heads/master c: 0825671 h: refs/heads/master v: v3
git-mirror · Jul 31, 2011 · a38c24d · a38c24d
1 parent aad3e51
commit a38c24d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59dead5a0c65abed0fe997a69692c11fcd0b11ca
+refs/heads/master: 08256712a2705f3ced3e54c3728932c9c39b58ad
diff --git a/trunk/drivers/mfd/wm831x-irq.c b/trunk/drivers/mfd/wm831x-irq.c
@@ -408,6 +408,11 @@ static int wm831x_irq_set_type(struct irq_data *data, unsigned int type)
 			return -EINVAL;
 	}
 
+	/* Rebase the IRQ into the GPIO range so we've got a sensible array
+	 * index.
+	 */
+	irq -= WM831X_IRQ_GPIO_1;
+
 	/* We set the high bit to flag that we need an update; don't
 	 * do the update here as we can be called with the bus lock
 	 * held.