diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
| commit | 2d93eaf2d4ace5853a74a4b0596f601aa62cb840 (patch) | |
| tree | b0a2e2083c1749c4e3b8ae23db7bb13a7ca9aafe /drivers/gpio/gpio-omap.c | |
| parent | 003133585fc61d7bd36d3a097d7fde62e64a9550 (diff) | |
| parent | 23d8c3f8f494c8516c9b4c05529e118e6a485956 (diff) | |
Merge commit 'v3.2.14' into rt-3.2.14-rt23v3.2.14-rt23
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 0b0562979171..a6c10e849e61 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -508,7 +508,10 @@ static void _disable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int enable) { - _enable_gpio_irqbank(bank, GPIO_BIT(bank, gpio)); + if (enable) + _enable_gpio_irqbank(bank, GPIO_BIT(bank, gpio)); + else + _disable_gpio_irqbank(bank, GPIO_BIT(bank, gpio)); } /* |