From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 18 Apr 2013 03:14:59 +0000 (+0800)
Subject: spi: omap2-mcspi: fix error return code in omap2_mcspi_probe()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=142e07beabfa8850e9e433b986e217fb596b9774;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

spi: omap2-mcspi: fix error return code in omap2_mcspi_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>
---

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index b3db4612b622..86d2158946bb 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1293,7 +1293,8 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
 	pm_runtime_enable(&pdev->dev);
 
-	if (status || omap2_mcspi_master_setup(mcspi) < 0)
+	status = omap2_mcspi_master_setup(mcspi);
+	if (status < 0)
 		goto disable_pm;
 
 	status = spi_register_master(master);