diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2020-04-22 03:45:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-22 15:07:46 +0200 |
| commit | f58dcab68aa57e74c12c9bec7ff1bb73e0b35143 (patch) | |
| tree | 96d0caafc6e1330d0407a699c0bf347caa4aebf1 /drivers/spi/spi-fsl-qspi.c | |
| parent | spi: bcm-qspi: MSPI_SPCR0_MSB MSTR bit exists only on legacy controllers (diff) | |
| download | linux-f58dcab68aa57e74c12c9bec7ff1bb73e0b35143.tar.xz linux-f58dcab68aa57e74c12c9bec7ff1bb73e0b35143.zip | |
spi: spi-fsl-qspi: Fix return value check of devm_ioremap() in probe
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>
Diffstat (limited to 'drivers/spi/spi-fsl-qspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-qspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c index 83eb8a484faf..6766262d7e75 100644 --- a/drivers/spi/spi-fsl-qspi.c +++ b/drivers/spi/spi-fsl-qspi.c @@ -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; } |