mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload
authorJohan Hovold <jhovold@gmail.com>
Wed, 13 Mar 2013 16:11:59 +0000 (17:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 May 2013 02:51:57 +0000 (19:51 -0700)
commitbb878b3019cb0b1d574bd88e30ce00ea6d6814f9
tree7c921c34fab9ca76d695d07877c0105361310228
parent165628d13556a2ea833b3e13d706a252491dc1fc
mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload

commit 91cf54feecf815bec0b6a8d6d9dbd0e219f2f2cc upstream.

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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/configs/at91sam9g45_defconfig
arch/avr32/configs/favr-32_defconfig
arch/avr32/configs/merisc_defconfig
drivers/mmc/host/Kconfig
drivers/mmc/host/atmel-mci.c