---

yaml --- r: 344980 b: refs/heads/master c: d511b9c h: refs/heads/master v: v3
git-mirror · Nov 20, 2012 · 3b2b510 · 3b2b510
1 parent 5f12b80
commit 3b2b510
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b5edf7887c6ec8c09c9064a2d14b578ef1904fe
+refs/heads/master: d511b9c3626c83874824b1118f8a2e84ef63a7d3
diff --git a/trunk/drivers/gpio/gpio-da9052.c b/trunk/drivers/gpio/gpio-da9052.c
@@ -185,7 +185,11 @@ static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset)
 	struct da9052_gpio *gpio = to_da9052_gpio(gc);
 	struct da9052 *da9052 = gpio->da9052;
 
-	return da9052->irq_base + DA9052_IRQ_GPI0 + offset;
+	int irq;
+
+	irq = regmap_irq_get_virq(da9052->irq_data, DA9052_IRQ_GPI0 + offset);
+
+	return irq;
 }
 
 static struct gpio_chip reference_gp __devinitdata = {