summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-18 11:14:59 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-18 12:04:55 +0100
commit142e07beabfa8850e9e433b986e217fb596b9774 (patch)
tree6a83b334b515fb1f6cf914999120290f9b641194 /drivers/spi
parent00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 (diff)
downloadop-kernel-dev-142e07beabfa8850e9e433b986e217fb596b9774.zip
op-kernel-dev-142e07beabfa8850e9e433b986e217fb596b9774.tar.gz
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-omap2-mcspi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index b3db461..86d2158 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);
OpenPOWER on IntegriCloud