Skip to content
/ linux Public

Commit 978137e

Browse files
Jinjie RuanSasha Levin
authored andcommitted
spi: wpcm-fiu: Fix uninitialized res
[ Upstream commit 0f2cf3b ] 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: 3bf2a53 ("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: 888a0a8 ("spi: wpcm-fiu: Fix potential NULL pointer dereference in wpcm_fiu_probe()") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 87e4631 commit 978137e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/spi/spi-wpcm-fiu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
458458
if (IS_ERR(fiu->clk))
459459
return PTR_ERR(fiu->clk);
460460

461-
fiu->memory = devm_platform_ioremap_resource_byname(pdev, "memory");
461+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
462+
fiu->memory = devm_ioremap_resource(dev, res);
462463
fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
463464
if (IS_ERR(fiu->memory)) {
464465
dev_err(dev, "Failed to map flash memory window\n");

0 commit comments

Comments
 (0)