diff options
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/083-0006-spi-bcm-qspi-Fix-return-value-check-in-bcm_qspi_prob.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-4.4/083-0006-spi-bcm-qspi-Fix-return-value-check-in-bcm_qspi_prob.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/083-0006-spi-bcm-qspi-Fix-return-value-check-in-bcm_qspi_prob.patch b/target/linux/bcm53xx/patches-4.4/083-0006-spi-bcm-qspi-Fix-return-value-check-in-bcm_qspi_prob.patch new file mode 100644 index 0000000000..d71b2f4599 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/083-0006-spi-bcm-qspi-Fix-return-value-check-in-bcm_qspi_prob.patch @@ -0,0 +1,29 @@ +From 3bf3eb2b95aaf18eff3080444b24673cda8ff9a2 Mon Sep 17 00:00:00 2001 +From: Wei Yongjun <weiyongjun1@huawei.com> +Date: Fri, 16 Sep 2016 13:45:17 +0000 +Subject: [PATCH] spi: bcm-qspi: Fix return value check in bcm_qspi_probe() + +In case of error, the function kcalloc() returns NULL pointer +not ERR_PTR(). The IS_ERR() test in the return value check +should be replaced with NULL test. + +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 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/spi/spi-bcm-qspi.c ++++ b/drivers/spi/spi-bcm-qspi.c +@@ -1174,8 +1174,8 @@ int bcm_qspi_probe(struct platform_devic + + qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id), + GFP_KERNEL); +- if (IS_ERR(qspi->dev_ids)) { +- ret = PTR_ERR(qspi->dev_ids); ++ if (!qspi->dev_ids) { ++ ret = -ENOMEM; + goto qspi_probe_err; + } + |