Commit f84b604d authored by Wei Yongjun's avatar Wei Yongjun Committed by Mark Brown

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: bbb336f3 ("spi: spi-amd: Add AMD SPI controller driver support")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200429025426.167664-1-weiyongjun1@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 68d047cb
...@@ -266,10 +266,9 @@ static int amd_spi_probe(struct platform_device *pdev) ...@@ -266,10 +266,9 @@ static int amd_spi_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
amd_spi->io_remap_addr = devm_ioremap_resource(&pdev->dev, res); amd_spi->io_remap_addr = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(amd_spi->io_remap_addr)) {
if (!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); dev_err(dev, "error %d ioremap of SPI registers failed\n", err);
err = -ENOMEM;
goto err_free_master; goto err_free_master;
} }
dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr); dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment