Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[android-sdk/kernel-video.git] / drivers / gpio / gpio-da9052.c

diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index a05aacd2777aaa92564f520885896b6d3d6c2c99..29b11e9b6a78600b2d14d61a178d5e1de3fdc2bc 100644 (file)
--- a/drivers/gpio/gpio-da9052.c
+++ b/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 = {