diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2017-11-09 09:38:42 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-11-09 09:38:42 +0100 |
commit | bee67c7c9d7d3252dce69c960a53e53fd6b04e09 (patch) | |
tree | e01f03a5c4530936c734508ec75ca82b37b484b8 /drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | |
parent | pinctrl: gemini: Fix GMAC groups (diff) | |
parent | pinctrl: bcm2835: Fix some merge fallout (diff) | |
download | linux-dev-bee67c7c9d7d3252dce69c960a53e53fd6b04e09.tar.xz linux-dev-bee67c7c9d7d3252dce69c960a53e53fd6b04e09.zip |
Merge branch 'gpio-irqchip-rework' of /home/linus/linux-gpio into devel
Diffstat (limited to 'drivers/pinctrl/bcm/pinctrl-iproc-gpio.c')
-rw-r--r-- | drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c index 5d08d989b1d0..b70058caee50 100644 --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c @@ -172,7 +172,7 @@ static void iproc_gpio_irq_handler(struct irq_desc *desc) for_each_set_bit(bit, &val, NGPIOS_PER_BANK) { unsigned pin = NGPIOS_PER_BANK * i + bit; - int child_irq = irq_find_mapping(gc->irqdomain, pin); + int child_irq = irq_find_mapping(gc->irq.domain, pin); /* * Clear the interrupt before invoking the |