diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-11 23:58:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-12 00:00:57 -0700 |
| commit | 7e6ecebd2cafd2106f134f55b9d37e7fe5f4f572 (patch) | |
| tree | 8f33e4fb2d87fd4197e8b0bf69d42fa70fbc0618 /arch/arm | |
| parent | caafc71b1a25096ef74904adb19d37e5c6a282dc (diff) | |
| parent | 2b3c83efc9a653af6a24799eeb1a2900ba0439e6 (diff) | |
Merge tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx into next/drivers
Branch has one driver feature and one board bug fix. Merging it as a driver branch.
DMA driver change was later:
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
* tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx:
dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels
arm: ep93xx: Don't try to release not acquired GPIO lines
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 8d2589588713..2ea2ffc61875 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -734,7 +734,7 @@ int ep93xx_keypad_acquire_gpio(struct platform_device *pdev) fail_gpio_d: gpio_free(EP93XX_GPIO_LINE_C(i)); fail_gpio_c: - for ( ; i >= 0; --i) { + for (--i; i >= 0; --i) { gpio_free(EP93XX_GPIO_LINE_C(i)); gpio_free(EP93XX_GPIO_LINE_D(i)); } |