You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
992 B
Diff
30 lines
992 B
Diff
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;
|
|
}
|
|
|