| Message ID | bc4c9123-df43-4616-962f-765801d30b4c@stanley.mountain (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [next] spi: stm32-ospi: Fix an IS_ERR() vs NULL bug in stm32_ospi_get_resources() | expand |
On 3/6/25 10:48, Dan Carpenter wrote: > The devm_ioremap() function returns NULL on error, it doesn't return > error pointers. Fix the check to match. > > Fixes: 79b8a705e26c ("spi: stm32: Add OSPI driver") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/spi/spi-stm32-ospi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-stm32-ospi.c b/drivers/spi/spi-stm32-ospi.c > index 8eadcb64f34a..a544d7897edf 100644 > --- a/drivers/spi/spi-stm32-ospi.c > +++ b/drivers/spi/spi-stm32-ospi.c > @@ -835,10 +835,10 @@ static int stm32_ospi_get_resources(struct platform_device *pdev) > if (rmem) { > ospi->mm_size = rmem->size; > ospi->mm_base = devm_ioremap(dev, rmem->base, rmem->size); > - if (IS_ERR(ospi->mm_base)) { > + if (!ospi->mm_base) { > dev_err(dev, "unable to map memory region: %pa+%pa\n", > &rmem->base, &rmem->size); > - ret = PTR_ERR(ospi->mm_base); > + ret = -ENOMEM; > goto err_dma; > } > Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
On Thu, 06 Mar 2025 12:48:34 +0300, Dan Carpenter wrote: > The devm_ioremap() function returns NULL on error, it doesn't return > error pointers. Fix the check to match. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: stm32-ospi: Fix an IS_ERR() vs NULL bug in stm32_ospi_get_resources() commit: 7dfc9bdde9fa20cf1ac5cbea97b0446622ca74c7 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-stm32-ospi.c b/drivers/spi/spi-stm32-ospi.c index 8eadcb64f34a..a544d7897edf 100644 --- a/drivers/spi/spi-stm32-ospi.c +++ b/drivers/spi/spi-stm32-ospi.c @@ -835,10 +835,10 @@ static int stm32_ospi_get_resources(struct platform_device *pdev) if (rmem) { ospi->mm_size = rmem->size; ospi->mm_base = devm_ioremap(dev, rmem->base, rmem->size); - if (IS_ERR(ospi->mm_base)) { + if (!ospi->mm_base) { dev_err(dev, "unable to map memory region: %pa+%pa\n", &rmem->base, &rmem->size); - ret = PTR_ERR(ospi->mm_base); + ret = -ENOMEM; goto err_dma; }
The devm_ioremap() function returns NULL on error, it doesn't return error pointers. Fix the check to match. Fixes: 79b8a705e26c ("spi: stm32: Add OSPI driver") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/spi/spi-stm32-ospi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)