From: Dan Carpenter Date: Wed, 9 Apr 2025 11:00:35 +0000 (+0300) Subject: spi: spi_amd: Fix an IS_ERR() vs NULL check in probe X-Git-Tag: v6.16-rc1~23^2~48 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e686365c0411275474527c2055ac133f2eb47526;p=linux-block.git spi: spi_amd: Fix an IS_ERR() vs NULL check in probe The devm_ioremap() function returns NULL on error, it doesn't return error pointers. Update the error checking to match. Fixes: b644c2776652 ("spi: spi_amd: Add PCI-based driver for AMD HID2 SPI controller") Signed-off-by: Dan Carpenter Link: https://patch.msgid.link/0e0f5ede-8993-4fac-967c-51e46b095416@stanley.mountain Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-amd-pci.c b/drivers/spi/spi-amd-pci.c index e1ecab755fe9..e5faab414c17 100644 --- a/drivers/spi/spi-amd-pci.c +++ b/drivers/spi/spi-amd-pci.c @@ -46,8 +46,8 @@ static int amd_spi_pci_probe(struct pci_dev *pdev, io_base_addr = (io_base_addr & AMD_SPI_BASE_ADDR_MASK) + AMD_HID2_PCI_BAR_OFFSET; amd_spi->io_remap_addr = devm_ioremap(dev, io_base_addr, AMD_HID2_MEM_SIZE); - if (IS_ERR(amd_spi->io_remap_addr)) - return dev_err_probe(dev, PTR_ERR(amd_spi->io_remap_addr), + if (!amd_spi->io_remap_addr) + return dev_err_probe(dev, -ENOMEM, "ioremap of SPI registers failed\n"); dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr);