summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-16 14:00:19 +0000
committerMark Brown <broonie@kernel.org>2016-09-16 17:23:11 +0100
commit71b8f350a4f03730f3024bfa7dc2414904a21bcb (patch)
tree99ab1adb4a14d14bf4acab384c1a4c9094fe7fc5 /drivers/spi
parent3bf3eb2b95aaf18eff3080444b24673cda8ff9a2 (diff)
downloadtalos-obmc-linux-71b8f350a4f03730f3024bfa7dc2414904a21bcb.tar.gz
talos-obmc-linux-71b8f350a4f03730f3024bfa7dc2414904a21bcb.zip
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>
Diffstat (limited to 'drivers/spi')
-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,
if (!num_ints) {
dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n");
+ ret = -EINVAL;
goto qspi_probe_err;
}
qspi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(qspi->clk)) {
dev_warn(dev, "unable to get clock\n");
+ ret = PTR_ERR(qspi->clk);
goto qspi_probe_err;
}
OpenPOWER on IntegriCloud