summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-18 02:13:24 +0200
committerOlof Johansson <olof@lixom.net>2012-10-18 02:13:24 +0200
commitb55a7a5fbf09ea59777c3b41b6f5cb1ae81aa2bb (patch)
tree549c504414df7e984e5843f9edb8fb02dcca890b
parentMerge tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/j... (diff)
parentgpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type (diff)
downloadlinux-b55a7a5fbf09ea59777c3b41b6f5cb1ae81aa2bb.tar.xz
linux-b55a7a5fbf09ea59777c3b41b6f5cb1ae81aa2bb.zip
Merge tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper: - missing break;s from converting if{}s to switch{} * tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux: gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
-rw-r--r--drivers/gpio/gpio-mvebu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 902af437eaf2..7a874129e5d8 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -381,11 +381,13 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));
u &= ~(1 << pin);
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
+ break;
case IRQ_TYPE_EDGE_FALLING:
case IRQ_TYPE_LEVEL_LOW:
u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));
u |= 1 << pin;
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
+ break;
case IRQ_TYPE_EDGE_BOTH: {
u32 v;
@@ -401,6 +403,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
else
u &= ~(1 << pin); /* rising */
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
+ break;
}
}
return 0;