From da6732a3a5f94c7c391e87dc88f22ab0e19eb389 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 3 Jun 2012 13:40:19 +0100
Subject: [PATCH] --- yaml --- r: 318444 b: refs/heads/master c:
 224a1f90458b5005fa7aec5e8a6d64fd8eccb208 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpio/gpio-wm8994.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6c5265845fd9..688e69790ac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f942a7de047d8c599cc1a9a26293c8c7400450ea
+refs/heads/master: 224a1f90458b5005fa7aec5e8a6d64fd8eccb208
diff --git a/trunk/drivers/gpio/gpio-wm8994.c b/trunk/drivers/gpio/gpio-wm8994.c
index 92ea5350dfe9..a1c7ba94b523 100644
--- a/trunk/drivers/gpio/gpio-wm8994.c
+++ b/trunk/drivers/gpio/gpio-wm8994.c
@@ -19,6 +19,7 @@
 #include <linux/mfd/core.h>
 #include <linux/platform_device.h>
 #include <linux/seq_file.h>
+#include <linux/regmap.h>
 
 #include <linux/mfd/wm8994/core.h>
 #include <linux/mfd/wm8994/pdata.h>
@@ -109,10 +110,7 @@ static int wm8994_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 	struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
 	struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
-	if (!wm8994->irq_base)
-		return -EINVAL;
-
-	return wm8994->irq_base + offset;
+	return regmap_irq_get_virq(wm8994->irq_data, offset);
 }