From a5b8ba816bca6ce992f14fa8dcb44641211fbed7 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 27 Sep 2012 14:14:09 +0200 Subject: [PATCH] --- yaml --- r: 328497 b: refs/heads/master c: 95f0bc9bf0db600fbefda9d2157b95d5ff55e783 h: refs/heads/master i: 328495: eccc3f1e6a2feebf630348058cbc9f9b4cd8ea4f v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 879b677ea1a0..46d880282352 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fd4011e165e4a28c06a044c919161e657138181 +refs/heads/master: 95f0bc9bf0db600fbefda9d2157b95d5ff55e783 diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c index fae10b311551..6030a513f3c4 100644 --- a/trunk/drivers/pinctrl/pinctrl-nomadik.c +++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c @@ -827,16 +827,14 @@ static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc, { struct nmk_gpio_chip *nmk_chip; struct irq_chip *host_chip = irq_get_chip(irq); - unsigned int first_irq; chained_irq_enter(host_chip, desc); nmk_chip = irq_get_handler_data(irq); - first_irq = nmk_chip->domain->revmap_data.legacy.first_irq; while (status) { int bit = __ffs(status); - generic_handle_irq(first_irq + bit); + generic_handle_irq(irq_find_mapping(nmk_chip->domain, bit)); status &= ~BIT(bit); }