aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-01 06:52:23 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-01 07:02:17 +0100
commit9209511d61fce02b0af48b44d963150e076e0f7e (patch)
tree2791f6e6e7370c8c977bd51e88bfe94eb9b5a022 /target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch
parentebf846b00559a326d6ea5a1711d11335d89d1218 (diff)
downloadupstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.gz
upstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.bz2
upstream-9209511d61fce02b0af48b44d963150e076e0f7e.zip
bcm53xx: backport Broadcom's iProc QSPI driver
This driver has been added instead of improving spi-bcm53xx. It has some advantages: allows SPI speed control & hopefully doesn't have bug that was stopping us from using multiple SPI messages for writing flash data. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch b/target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch
new file mode 100644
index 0000000000..a15deb5749
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/083-0007-spi-bcm-qspi-Fix-error-return-code-in-bcm_qspi_probe.patch
@@ -0,0 +1,32 @@
+From 71b8f350a4f03730f3024bfa7dc2414904a21bcb Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <weiyongjun1@huawei.com>
+Date: Fri, 16 Sep 2016 14:00:19 +0000
+Subject: [PATCH] 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>
+---
+ drivers/spi/spi-bcm-qspi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/spi/spi-bcm-qspi.c
++++ b/drivers/spi/spi-bcm-qspi.c
+@@ -1205,12 +1205,14 @@ int bcm_qspi_probe(struct platform_devic
+
+ 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;
+ }
+