* [PATCH] pinctrl: bcm2835: Fix some merge fallout
@ 2017-11-09 8:37 Linus Walleij
2017-11-09 10:05 ` Thierry Reding
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2017-11-09 8:37 UTC (permalink / raw)
To: linux-gpio; +Cc: Linus Walleij, Thierry Reding
Fixing a small merge problem in BCM2835 related to the
new irqchip code.
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index fb85ab3cf662..72d122748293 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -383,7 +383,7 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,
/* FIXME: no clue why the code looks up the type here */
type = pc->irq_type[gpio];
- generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.irqdomain,
+ generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
gpio));
}
}
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pinctrl: bcm2835: Fix some merge fallout
2017-11-09 8:37 [PATCH] pinctrl: bcm2835: Fix some merge fallout Linus Walleij
@ 2017-11-09 10:05 ` Thierry Reding
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2017-11-09 10:05 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-gpio
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
On Thu, Nov 09, 2017 at 09:37:10AM +0100, Linus Walleij wrote:
> Fixing a small merge problem in BCM2835 related to the
> new irqchip code.
>
> Cc: Thierry Reding <treding@nvidia.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I was just going to send out a fixup for this as well. Looks like this
may be the result of the conflict that I had mentioned.
Anyway, not that you really need it, but:
Reviewed-by: Thierry Reding <treding@nvidia.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-09 10:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-09 8:37 [PATCH] pinctrl: bcm2835: Fix some merge fallout Linus Walleij
2017-11-09 10:05 ` Thierry Reding
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.