summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-orion.c
diff options
context:
space:
mode:
authorWei Yongjun2014-07-20 16:03:14 +0200
committerMark Brown2014-07-25 19:28:46 +0200
commit1403381638e03b361afde8f3e107ecc8e6c8f54f (patch)
tree8d096a988b68a81abd4650a903a9369f1e4b3ab5 /drivers/spi/spi-orion.c
parentspi: spi-orion: add runtime PM support (diff)
downloadkernel-qcow2-linux-1403381638e03b361afde8f3e107ecc8e6c8f54f.tar.gz
kernel-qcow2-linux-1403381638e03b361afde8f3e107ecc8e6c8f54f.tar.xz
kernel-qcow2-linux-1403381638e03b361afde8f3e107ecc8e6c8f54f.zip
spi: orion: Fix error return code in orion_spi_probe()
Fix to return a negative error code from the error handling case of orion_spi_reset() instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-orion.c')
-rw-r--r--drivers/spi/spi-orion.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index aa3ecfc6b466..3a3170ae3b31 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -406,7 +406,8 @@ static int orion_spi_probe(struct platform_device *pdev)
pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
pm_runtime_enable(&pdev->dev);
- if (orion_spi_reset(spi) < 0)
+ status = orion_spi_reset(spi);
+ if (status < 0)
goto out_rel_pm;
pm_runtime_mark_last_busy(&pdev->dev);