projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi: omap2-mcspi: fix error return code in omap2_mcspi_probe()
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
spi
/
spi-omap2-mcspi.c
diff --git
a/drivers/spi/spi-omap2-mcspi.c
b/drivers/spi/spi-omap2-mcspi.c
index b3db4612b6228a57b1ffe5df9626067e9b5a8eb6..86d2158946bbf3de879cc459e53aa00005e6768f 100644
(file)
--- 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);
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);
goto disable_pm;
status = spi_register_master(master);