[-next] spi: orion: Fix error return code in orion_spi_probe()
diff mbox

Message ID 1405864994-14292-1-git-send-email-weiyj_lk@163.com
State Accepted
Commit 1403381638e03b361afde8f3e107ecc8e6c8f54f
Headers show

Commit Message

weiyj_lk@163.com July 20, 2014, 2:03 p.m. UTC
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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>
---
 drivers/spi/spi-orion.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Mark Brown July 25, 2014, 5:29 p.m. UTC | #1
On Sun, Jul 20, 2014 at 10:03:14PM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> 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.

Applied, thanks.

Patch
diff mbox

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index aa3ecfc..3a3170a 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);