From d4a1917b535e98f1566c7f79911faece72d2e94b Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Tue, 11 Oct 2011 10:24:21 +0200 Subject: [PATCH] --- yaml --- r: 274238 b: refs/heads/master c: cfadd83852eb6b9a015bc1ea396b98f395f073e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-mpc8xxx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1c10938280cb..4cf1b82edbac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15a5148c6fa6d786d4ed94c6da3b6ed1b2b44f25 +refs/heads/master: cfadd83852eb6b9a015bc1ea396b98f395f073e0 diff --git a/trunk/drivers/gpio/gpio-mpc8xxx.c b/trunk/drivers/gpio/gpio-mpc8xxx.c index d74d19bf3af5..ec3fcf0a7e12 100644 --- a/trunk/drivers/gpio/gpio-mpc8xxx.c +++ b/trunk/drivers/gpio/gpio-mpc8xxx.c @@ -146,6 +146,7 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset) static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc) { struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc; unsigned int mask; @@ -153,6 +154,7 @@ static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc) if (mask) generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq, 32 - ffs(mask))); + chip->irq_eoi(&desc->irq_data); } static void mpc8xxx_irq_unmask(struct irq_data *d)