aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2007-12-01 18:05:26 -0800
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 09:13:56 -0700
commitd6ada2577601576099934448a0391bb37296b3db (patch)
treebf2c44a8a110aab531ba319f6986664835051a16 /arch/arm/mach-msm
parent[ARM] msm: Add MSM_DEBUG_UART option. (diff)
downloadlinux-dev-d6ada2577601576099934448a0391bb37296b3db.tar.xz
linux-dev-d6ada2577601576099934448a0391bb37296b3db.zip
[ARM] msm: irq: fix lockdep issues
Signed-off-by: Brian Swetland <swetland@google.com>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
index 69ca0dd79bdf..6c8d5f8caef3 100644
--- a/arch/arm/mach-msm/irq.c
+++ b/arch/arm/mach-msm/irq.c
@@ -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;
}