summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-03 15:06:40 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 19:37:38 +0200
commit58ad60bbb2abada33fbeae88943ab038e2fcc0ef (patch)
treeb8aca631bb2ffea2e82f43ff171ea0290898310f
parentspi: tegra: slink: do prepare dma transfer with DMA_CTRL_ACK flag (diff)
downloadlinux-58ad60bbb2abada33fbeae88943ab038e2fcc0ef.tar.xz
linux-58ad60bbb2abada33fbeae88943ab038e2fcc0ef.zip
mxs/spi: fix error return code in mxs_spi_probe()
Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/spi/spi-mxs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 22a0af0147fb..a1d5778e2bbb 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -612,6 +612,7 @@ static int mxs_spi_probe(struct platform_device *pdev)
ssp->dmach = dma_request_channel(mask, mxs_ssp_dma_filter, ssp);
if (!ssp->dmach) {
dev_err(ssp->dev, "Failed to request DMA\n");
+ ret = -ENODEV;
goto out_master_free;
}