aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-12-09 10:37:41 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:41 +0000
commit4725d31fee729f537aa82c1bd29f849a1af9a4e0 (patch)
tree831a95e291482dd59bb11ccd6e68d3832b248648 /drivers
parent57e62a6f82d8928459aa233e8b627f74181c37cf (diff)
downloadmrst-s0i3-test-4725d31fee729f537aa82c1bd29f849a1af9a4e0.tar.gz
mrst-s0i3-test-4725d31fee729f537aa82c1bd29f849a1af9a4e0.tar.xz
mrst-s0i3-test-4725d31fee729f537aa82c1bd29f849a1af9a4e0.zip
spi/dw_spi: Don't quit when DMA initialisation fails
Even if the dma init failed, we can keep on going with Program IO mode. Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/dw_spi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 69cc223da8b..9c1d07b6412 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -903,8 +903,10 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
if (dws->dma_ops && dws->dma_ops->dma_init) {
ret = dws->dma_ops->dma_init(dws);
- if (ret)
- goto err_diable_hw;
+ if (ret) {
+ dev_warn(&master->dev, "DMA init failed\n");
+ dws->dma_inited = 0;
+ }
}
/* Initial and start queue */