summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorHong Xu <hong.xu@atmel.com>2011-03-30 16:26:41 +0800
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-01 16:44:32 +0300
commitcb457a4ddd4eeac9c81792a1e6a5d59b1b44abe1 (patch)
tree804630a6dd6919fb0fb5d7835f4bfdb480c81c6b /drivers/mtd
parent042bc9c0c434b61241ceda1d332e3076e2571859 (diff)
downloadblackbird-op-linux-cb457a4ddd4eeac9c81792a1e6a5d59b1b44abe1.tar.gz
blackbird-op-linux-cb457a4ddd4eeac9c81792a1e6a5d59b1b44abe1.zip
mtd: atmel_nand: fix support for CPUs that do not support DMA access
use_dma was always "1" even if the CPU does not support DMA Tested on AT91SAM9261EK by Jean-Christophe PLAGNIOL-VILLARD Reported-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/atmel_nand.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 7e88a801669c..f254fa636afc 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -599,7 +599,10 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
nand_chip->options |= NAND_USE_FLASH_BBT;
}
- if (cpu_has_dma() && use_dma) {
+ if (!cpu_has_dma())
+ use_dma = 0;
+
+ if (use_dma) {
dma_cap_mask_t mask;
dma_cap_zero(mask);
OpenPOWER on IntegriCloud