spi: spi-fsl-qspi: Fix return value check of devm_ioremap() in probe
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 22 Apr 2020 01:45:43 +0000 (01:45 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 22 Apr 2020 13:07:46 +0000 (14:07 +0100)
In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.

Fixes: 858e26a515c2 ("spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB buffer size")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Acked-by: Han Xu <han.xu@nxp.com>
Link: https://lore.kernel.org/r/20200422014543.111070-1-weiyongjun1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-fsl-qspi.c

index 83eb8a484faf197c8153673868b9ab6767cadc98..6766262d7e7519635950c73077f70a77143ba0ce 100644 (file)
@@ -880,8 +880,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
        /* Since there are 4 cs, map size required is 4 times ahb_buf_size */
        q->ahb_addr = devm_ioremap(dev, q->memmap_phy,
                                   (q->devtype_data->ahb_buf_size * 4));
-       if (IS_ERR(q->ahb_addr)) {
-               ret = PTR_ERR(q->ahb_addr);
+       if (!q->ahb_addr) {
+               ret = -ENOMEM;
                goto err_put_ctrl;
        }