aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-14 14:53:02 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-14 14:53:02 -1000
commitbaaae1921088079bdb8e71317b06d071511d74b1 (patch)
treead4bdf52e9c0aaac0467f787bebd52370d581ad6
parent5bd2c2867ffc0f4beeac5b94b0f674969f24c883 (diff)
parentfebe06962ab191db50e633a0f79d9fb89a2d1078 (diff)
downloadlinux-baaae1921088079bdb8e71317b06d071511d74b1.tar.gz
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irqchip fix from Thomas Gleixner: "A single fix for an off by one bug in the sunxi irqchip driver" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: sunxi-nmi: Fix off-by-one error in irq iterator
-rw-r--r--drivers/irqchip/irq-sunxi-nmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index 4a9ce5b50c5b..6b2b582433bd 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -104,7 +104,7 @@ static int sunxi_sc_nmi_set_type(struct irq_data *data, unsigned int flow_type)
irqd_set_trigger_type(data, flow_type);
irq_setup_alt_chip(data, flow_type);
- for (i = 0; i <= gc->num_ct; i++, ct++)
+ for (i = 0; i < gc->num_ct; i++, ct++)
if (ct->type & flow_type)
ctrl_off = ct->regs.type;