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)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 30 May 2013 13:34:48 +0000 (14:34 +0100)
commit29878cdb099a4703b884aa1e0354fedff9766133
treefb96b8e8db7ec2183f8d374fd9c2451b36c30075
parenta331e84de8c7f69cf484fcc47713893668e2edeb
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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