aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-orion.c
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-20 10:03:14 -0400
committerMark Brown <broonie@linaro.org>2014-07-25 13:28:46 -0400
commit1403381638e03b361afde8f3e107ecc8e6c8f54f (patch)
tree8d096a988b68a81abd4650a903a9369f1e4b3ab5 /drivers/spi/spi-orion.c
parent5c6786945b4e0434312572da6cf40f13f1763740 (diff)
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)
406 pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); 406 pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
407 pm_runtime_enable(&pdev->dev); 407 pm_runtime_enable(&pdev->dev);
408 408
409 if (orion_spi_reset(spi) < 0) 409 status = orion_spi_reset(spi);
410 if (status < 0)
410 goto out_rel_pm; 411 goto out_rel_pm;
411 412
412 pm_runtime_mark_last_busy(&pdev->dev); 413 pm_runtime_mark_last_busy(&pdev->dev);