diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-13 12:11:59 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-03-22 12:57:22 -0400 |
| commit | 91cf54feecf815bec0b6a8d6d9dbd0e219f2f2cc (patch) | |
| tree | 97bf59680c63526b921a0e069eb4caa1ec04317f /arch/arm/configs | |
| parent | 0f6e73d0abde95973354b4921b4d08acf01a8b5c (diff) | |
mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload
Fix regression introduced by commit 796211b7953 ("mmc: atmel-mci: add
pdc support and runtime capabilities detection") which removed the need
for CONFIG_MMC_ATMELMCI_DMA but kept the Kconfig-entry as well as the
compile guards around dma_release_channel() in remove(). Consequently,
DMA is always enabled (if supported), but the DMA-channel is not
released on module unload unless the DMA-config option is selected.
Remove the no longer used CONFIG_MMC_ATMELMCI_DMA option completely.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/at91sam9g45_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig index 606d48f3b8f8..8aab786863df 100644 --- a/arch/arm/configs/at91sam9g45_defconfig +++ b/arch/arm/configs/at91sam9g45_defconfig | |||
| @@ -173,7 +173,6 @@ CONFIG_MMC=y | |||
| 173 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 173 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
| 174 | CONFIG_SDIO_UART=m | 174 | CONFIG_SDIO_UART=m |
| 175 | CONFIG_MMC_ATMELMCI=y | 175 | CONFIG_MMC_ATMELMCI=y |
| 176 | CONFIG_MMC_ATMELMCI_DMA=y | ||
| 177 | CONFIG_LEDS_ATMEL_PWM=y | 176 | CONFIG_LEDS_ATMEL_PWM=y |
| 178 | CONFIG_LEDS_GPIO=y | 177 | CONFIG_LEDS_GPIO=y |
| 179 | CONFIG_LEDS_TRIGGER_TIMER=y | 178 | CONFIG_LEDS_TRIGGER_TIMER=y |