diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2020-04-29 04:54:26 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-29 19:52:15 +0200 |
| commit | f84b604dbaf242d17135f527dbe81093a41226b3 (patch) | |
| tree | e2b05715c0d8238dec6d40a7dbeea425dd79ee35 /drivers/spi/spi-amd.c | |
| parent | spi: spi-amd: fix warning (diff) | |
| download | linux-f84b604dbaf242d17135f527dbe81093a41226b3.tar.xz linux-f84b604dbaf242d17135f527dbe81093a41226b3.zip | |
spi: spi-amd: Fix a NULL vs IS_ERR() check in amd_spi_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: bbb336f39efc ("spi: spi-amd: Add AMD SPI controller driver support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200429025426.167664-1-weiyongjun1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-amd.c')
| -rw-r--r-- | drivers/spi/spi-amd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c index c5a16dd44fa3..c7cfc3dc20b1 100644 --- a/drivers/spi/spi-amd.c +++ b/drivers/spi/spi-amd.c @@ -266,10 +266,9 @@ static int amd_spi_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); amd_spi->io_remap_addr = devm_ioremap_resource(&pdev->dev, res); - - if (!amd_spi->io_remap_addr) { + if (IS_ERR(amd_spi->io_remap_addr)) { + err = PTR_ERR(amd_spi->io_remap_addr); dev_err(dev, "error %d ioremap of SPI registers failed\n", err); - err = -ENOMEM; goto err_free_master; } dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr); |