]> git.karo-electronics.de Git - linux-beck.git/commitdiff
spi: bcm-qspi: Fix return value check in bcm_qspi_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Fri, 16 Sep 2016 13:45:17 +0000 (13:45 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 16 Sep 2016 16:23:11 +0000 (17:23 +0100)
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

index 64e693de1486ebdf77db6a82e78db6540a89efa9..2caeea75a7527e1f4c49dc6631228951302a6ba4 100644 (file)
@@ -1174,8 +1174,8 @@ int bcm_qspi_probe(struct platform_device *pdev,
 
        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;
        }