aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-16 10:00:19 -0400
committerMark Brown <broonie@kernel.org>2016-09-16 12:23:11 -0400
commit71b8f350a4f03730f3024bfa7dc2414904a21bcb (patch)
tree99ab1adb4a14d14bf4acab384c1a4c9094fe7fc5
parent3bf3eb2b95aaf18eff3080444b24673cda8ff9a2 (diff)
spi: bcm-qspi: Fix error return code in bcm_qspi_probe()
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-bcm-qspi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 2caeea75a752..2c121ba8f0cb 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1205,12 +1205,14 @@ int bcm_qspi_probe(struct platform_device *pdev,
1205 1205
1206 if (!num_ints) { 1206 if (!num_ints) {
1207 dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n"); 1207 dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n");
1208 ret = -EINVAL;
1208 goto qspi_probe_err; 1209 goto qspi_probe_err;
1209 } 1210 }
1210 1211
1211 qspi->clk = devm_clk_get(&pdev->dev, NULL); 1212 qspi->clk = devm_clk_get(&pdev->dev, NULL);
1212 if (IS_ERR(qspi->clk)) { 1213 if (IS_ERR(qspi->clk)) {
1213 dev_warn(dev, "unable to get clock\n"); 1214 dev_warn(dev, "unable to get clock\n");
1215 ret = PTR_ERR(qspi->clk);
1214 goto qspi_probe_err; 1216 goto qspi_probe_err;
1215 } 1217 }
1216 1218