aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-wm8994.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index 92ea5350dfe9..a1c7ba94b523 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -19,6 +19,7 @@
19#include <linux/mfd/core.h> 19#include <linux/mfd/core.h>
20#include <linux/platform_device.h> 20#include <linux/platform_device.h>
21#include <linux/seq_file.h> 21#include <linux/seq_file.h>
22#include <linux/regmap.h>
22 23
23#include <linux/mfd/wm8994/core.h> 24#include <linux/mfd/wm8994/core.h>
24#include <linux/mfd/wm8994/pdata.h> 25#include <linux/mfd/wm8994/pdata.h>
@@ -109,10 +110,7 @@ static int wm8994_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
109 struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip); 110 struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
110 struct wm8994 *wm8994 = wm8994_gpio->wm8994; 111 struct wm8994 *wm8994 = wm8994_gpio->wm8994;
111 112
112 if (!wm8994->irq_base) 113 return regmap_irq_get_virq(wm8994->irq_data, offset);
113 return -EINVAL;
114
115 return wm8994->irq_base + offset;
116} 114}
117 115
118 116