diff options
| author | Jinjie Ruan <ruanjinjie@huawei.com> | 2024-08-26 21:25:43 +0800 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2026-03-04 07:20:27 -0500 |
| commit | 978137e940de1b17ff01fea725fd50555139e883 (patch) | |
| tree | cf4ef190407e81c2fb54a9aae60610d377b68a54 /drivers/spi | |
| parent | 87e463136302bdbbd53b870ca910f48d3ea6f13c (diff) | |
| download | linux-978137e940de1b17ff01fea725fd50555139e883.tar.gz linux-978137e940de1b17ff01fea725fd50555139e883.tar.bz2 linux-978137e940de1b17ff01fea725fd50555139e883.zip | |
spi: wpcm-fiu: Fix uninitialized res
[ Upstream commit 0f2cf3bc4727fd07e3a1c8acb9f83e462b455986 ]
The second platform_get_resource_byname() can not be replaced with
devm_platform_ioremap_resource_byname(), because the intermediate "res"
is used by resource_size() later.
Fixes: 3bf2a5359b0b ("spi: wpcm-fiu: Use devm_platform_ioremap_resource_byname()")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20240826132544.3463616-2-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 888a0a802c46 ("spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-wpcm-fiu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-wpcm-fiu.c b/drivers/spi/spi-wpcm-fiu.c index 5d1634052400..d07a06f49204 100644 --- a/drivers/spi/spi-wpcm-fiu.c +++ b/drivers/spi/spi-wpcm-fiu.c @@ -458,7 +458,8 @@ static int wpcm_fiu_probe(struct platform_device *pdev) if (IS_ERR(fiu->clk)) return PTR_ERR(fiu->clk); - fiu->memory = devm_platform_ioremap_resource_byname(pdev, "memory"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory"); + fiu->memory = devm_ioremap_resource(dev, res); fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL); if (IS_ERR(fiu->memory)) { dev_err(dev, "Failed to map flash memory window\n"); |