]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[ARM] msm: irq: fix lockdep issues
authorArve Hjønnevåg <arve@android.com>
Sun, 2 Dec 2007 02:05:26 +0000 (18:05 -0800)
committerDaniel Walker <dwalker@codeaurora.org>
Wed, 12 May 2010 16:13:56 +0000 (09:13 -0700)
Signed-off-by: Brian Swetland <swetland@google.com>
arch/arm/mach-msm/irq.c

index 69ca0dd79bdfc65ed8bdbeff8d1535969f1bd5a8..6c8d5f8caef30f29bbbd8f594e3ad9f0ec4a9928 100644 (file)
@@ -101,11 +101,11 @@ static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
 
        if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
                writel(readl(treg) | b, treg);
-               set_irq_handler(irq, handle_edge_irq);
+               irq_desc[irq].handle_irq = handle_edge_irq;
        }
        if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) {
                writel(readl(treg) & (~b), treg);
-               set_irq_handler(irq, handle_level_irq);
+               irq_desc[irq].handle_irq = handle_level_irq;
        }
        return 0;
 }