| Message ID | 20200429025426.167664-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f84b604dbaf242d17135f527dbe81093a41226b3 |
| Headers | show |
| Series | [-next] spi: spi-amd: Fix a NULL vs IS_ERR() check in amd_spi_probe() | expand |
On Wed, 29 Apr 2020 02:54:26 +0000, Wei Yongjun wrote: > 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> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.8 Thanks! [1/1] spi: spi-amd: Fix a NULL vs IS_ERR() check in amd_spi_probe() commit: f84b604dbaf242d17135f527dbe81093a41226b3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c index 0d9debe1386e..d8e66689d132 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);
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> --- drivers/spi/spi-amd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)