summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2013-04-03 19:40:14 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-04-11 19:01:19 +0200
commite7a7f972f9120a7985d38a2be8c540047c94392f (patch)
tree7b054a5e516a0ea9fbaa701ecf74878c92a1ea3c
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
downloadlinux-3.10-e7a7f972f9120a7985d38a2be8c540047c94392f.tar.gz
linux-3.10-e7a7f972f9120a7985d38a2be8c540047c94392f.tar.bz2
linux-3.10-e7a7f972f9120a7985d38a2be8c540047c94392f.zip
gpio: pca953x: fix irq_domain_add_simple usage
We actually have to pass chip as the host_data parameter of irq_domain_add_simple() as later on, it is used to initialize chip_data in pca953x_gpio_irq_map(). Failing to do so is leading to a NULL pointer dereference after calling irq_data_get_irq_chip_data() in pca953x_irq_mask(), pca953x_irq_unmask(), pca953x_irq_bus_lock(), pca953x_irq_bus_sync_unlock() and pca953x_irq_set_type(). Fixes regression introduced by commit 0e8f2fdacf1d44651aa7e57063c76142d1f4988b (gpio: pca953x: use simple irqdomain) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-pca953x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 24059462c87..9391cf16e99 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -575,7 +575,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
chip->gpio_chip.ngpio,
irq_base,
&pca953x_irq_simple_ops,
- NULL);
+ chip);
if (!chip->domain)
return -ENODEV;