Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29501577 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTH 



Since IRQ_TYPE_EDGE_BOTH is defined as (IRQ_TYPE_EDGE_FALLING |
IRQ_TYPE_EDGE_RISING), testing against it with a bitwise AND also matches
both single-edge cases in addition to the intended both edges case. Fix it,
replacing with a more accurate expression.

Created and tested againts linux-2.6.34-rc3.
Applicable to 2.6.33-stable as well.

Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 46cdc4e4

arch/arm/plat-omap/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) 
	case METHOD_MPUIO:

		reg += OMAP_MPUIO_GPIO_INT_EDGE;

		l = __raw_readl(reg);

		if (trigger & IRQ_TYPE_EDGE_BOTH)

		if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)

			bank->toggle_mask |= 1 << gpio;

		if (trigger & IRQ_TYPE_EDGE_RISING)

			l |= 1 << gpio;
@@ -812,7 +812,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) 
	case METHOD_GPIO_1510:

		reg += OMAP1510_GPIO_INT_CONTROL;

		l = __raw_readl(reg);

		if (trigger & IRQ_TYPE_EDGE_BOTH)

		if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)

			bank->toggle_mask |= 1 << gpio;

		if (trigger & IRQ_TYPE_EDGE_RISING)

			l |= 1 << gpio;
@@ -846,7 +846,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) 
	case METHOD_GPIO_7XX:

		reg += OMAP7XX_GPIO_INT_CONTROL;

		l = __raw_readl(reg);

		if (trigger & IRQ_TYPE_EDGE_BOTH)

		if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)

			bank->toggle_mask |= 1 << gpio;

		if (trigger & IRQ_TYPE_EDGE_RISING)

			l |= 1 << gpio;