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/gpio/gpio-ath79.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/gpio/gpio-ath79.c')
| -rw-r--r-- | drivers/gpio/gpio-ath79.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c index f33d4a5fe671..5fad89dfab7e 100644 --- a/drivers/gpio/gpio-ath79.c +++ b/drivers/gpio/gpio-ath79.c @@ -132,6 +132,7 @@ static int ath79_gpio_irq_set_type(struct irq_data *data, case IRQ_TYPE_LEVEL_HIGH: polarity |= mask; + /* fall through */ case IRQ_TYPE_LEVEL_LOW: type |= mask; break; @@ -208,7 +209,7 @@ static void ath79_gpio_irq_handler(struct irq_desc *desc) if (pending) { for_each_set_bit(irq, &pending, gc->ngpio) generic_handle_irq( - irq_linear_revmap(gc->irqdomain, irq)); + irq_linear_revmap(gc->irq.domain, irq)); } chained_irq_exit(irqchip, desc); |