projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d7c472
)
spi: spi_amd: Fix an IS_ERR() vs NULL check in probe
author
Dan Carpenter
<dan.carpenter@linaro.org>
Wed, 9 Apr 2025 11:00:35 +0000
(14:00 +0300)
committer
Mark Brown
<broonie@kernel.org>
Wed, 9 Apr 2025 12:47:45 +0000
(13:47 +0100)
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 <dan.carpenter@linaro.org>
Link:
https://patch.msgid.link/0e0f5ede-8993-4fac-967c-51e46b095416@stanley.mountain
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-amd-pci.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/spi/spi-amd-pci.c
b/drivers/spi/spi-amd-pci.c
index e1ecab755fe93dbf2589c28011cb28e48349ceb3..e5faab414c172653562f5f7bec96109a26e0f567 100644
(file)
--- 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);