Jelajahi Sumber

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>
Wei Yongjun 12 tahun lalu
induk
melakukan
142e07beab
1 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 1
      drivers/spi/spi-omap2-mcspi.c

+ 2 - 1
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_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
 	pm_runtime_enable(&pdev->dev);
 	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;
 		goto disable_pm;
 
 
 	status = spi_register_master(master);
 	status = spi_register_master(master);