summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 05:21:45 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 05:21:45 +0400
commitee8b890e1e7fd5fc8258a713d7c868324e67b8c0 (patch)
treeb1a0683e2100df71f6418ac21402b2b6500f7682
parentce6fbaf160628df62ec953c701d5fc547484257a (diff)
parente7a7f972f9120a7985d38a2be8c540047c94392f (diff)
downloadlinux-ee8b890e1e7fd5fc8258a713d7c868324e67b8c0.tar.xz
Merge tag 'gpio-fixes-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fix from Linus Walleij: "Oneliner fix for the PCA 953x driver." * tag 'gpio-fixes-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: pca953x: fix irq_domain_add_simple usage
-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 24059462c87f..9391cf16e990 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;