diff options
author | Arve Hjønnevåg <arve@android.com> | 2007-12-01 21:05:26 -0500 |
---|---|---|
committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 12:13:56 -0400 |
commit | d6ada2577601576099934448a0391bb37296b3db (patch) | |
tree | bf2c44a8a110aab531ba319f6986664835051a16 | |
parent | 36cf1b55b4caa188f2d070bb18a69ebe3c70580f (diff) |
[ARM] msm: irq: fix lockdep issues
Signed-off-by: Brian Swetland <swetland@google.com>
-rw-r--r-- | arch/arm/mach-msm/irq.c | 4 |
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) | |||
101 | 101 | ||
102 | if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) { | 102 | if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) { |
103 | writel(readl(treg) | b, treg); | 103 | writel(readl(treg) | b, treg); |
104 | set_irq_handler(irq, handle_edge_irq); | 104 | irq_desc[irq].handle_irq = handle_edge_irq; |
105 | } | 105 | } |
106 | if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) { | 106 | if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) { |
107 | writel(readl(treg) & (~b), treg); | 107 | writel(readl(treg) & (~b), treg); |
108 | set_irq_handler(irq, handle_level_irq); | 108 | irq_desc[irq].handle_irq = handle_level_irq; |
109 | } | 109 | } |
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |