diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 14:45:31 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-07-17 14:45:31 +0200 |
| commit | bcae888039d5f0b522e1588c54f95a7612d1723c (patch) | |
| tree | d8039698a3b74223dc94798046049e9bfcf23fe7 /drivers/gpio/gpiolib.c | |
| parent | 3685bbce2ea6142e81c78e6f3d5b2a1cdc37660e (diff) | |
| parent | bdac2b6dc7392668a8530d67a5f762366f57f9b4 (diff) | |
Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 174447fc7457..6d60ec2c9a79 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -446,8 +446,8 @@ void gpiochip_set_chained_irqchip(struct gpio_chip *gpiochip, * The parent irqchip is already using the chip_data for this * irqchip, so our callbacks simply use the handler_data. */ - irq_set_handler_data(parent_irq, gpiochip); - irq_set_chained_handler(parent_irq, parent_handler); + irq_set_chained_handler_and_data(parent_irq, parent_handler, + gpiochip); gpiochip->irq_parent = parent_irq; } |