提交 74164016 编写于 作者: T Thomas Gleixner 提交者: Sekhar Nori

arm: davinci: Fix fallout from generic irq chip conversion

The code which does the chained handler setup was overwriting
chip_data.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Tested-by: NHolger Hans Peter Freyther <holger@freyther.de>
Signed-off-by: NKevin Hilman <khilman@ti.com>
Signed-off-by: NSekhar Nori <nsekhar@ti.com>
上级 59c5f46f
......@@ -252,9 +252,11 @@ static struct irq_chip gpio_irqchip = {
static void
gpio_irq_handler(unsigned irq, struct irq_desc *desc)
{
struct davinci_gpio_regs __iomem *g = irq2regs(irq);
struct davinci_gpio_regs __iomem *g;
u32 mask = 0xffff;
g = (__force struct davinci_gpio_regs __iomem *) irq_desc_get_handler_data(desc);
/* we only care about one bank */
if (irq & 1)
mask <<= 16;
......@@ -422,8 +424,7 @@ static int __init davinci_gpio_irq_setup(void)
/* set up all irqs in this bank */
irq_set_chained_handler(bank_irq, gpio_irq_handler);
irq_set_chip_data(bank_irq, (__force void *)g);
irq_set_handler_data(bank_irq, (void *)irq);
irq_set_handler_data(bank_irq, (__force void *)g);
for (i = 0; i < 16 && gpio < ngpio; i++, irq++, gpio++) {
irq_set_chip(irq, &gpio_irqchip);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册