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/gpio-tz1090.c | |
| parent | 3685bbce2ea6142e81c78e6f3d5b2a1cdc37660e (diff) | |
| parent | bdac2b6dc7392668a8530d67a5f762366f57f9b4 (diff) | |
| download | linux-stable-bcae888039d5f0b522e1588c54f95a7612d1723c.tar.gz linux-stable-bcae888039d5f0b522e1588c54f95a7612d1723c.tar.bz2 linux-stable-bcae888039d5f0b522e1588c54f95a7612d1723c.zip | |
Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel
Diffstat (limited to 'drivers/gpio/gpio-tz1090.c')
| -rw-r--r-- | drivers/gpio/gpio-tz1090.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c index 445660adc898..bbac92ae4c32 100644 --- a/drivers/gpio/gpio-tz1090.c +++ b/drivers/gpio/gpio-tz1090.c @@ -510,8 +510,8 @@ static int tz1090_gpio_bank_probe(struct tz1090_gpio_bank_info *info) gc->chip_types[1].chip.flags = IRQCHIP_MASK_ON_SUSPEND; /* Setup chained handler for this GPIO bank */ - irq_set_handler_data(bank->irq, bank); - irq_set_chained_handler(bank->irq, tz1090_gpio_irq_handler); + irq_set_chained_handler_and_data(bank->irq, tz1090_gpio_irq_handler, + bank); return 0; } |