Skip to content

Commit 1db8665

Browse files
committed
spi: wpcm-fiu: Fix uninitialized res
Merge series from Jinjie Ruan <[email protected]>: Fix uninitialized res in probe function.
2 parents 3959d1f + 196d34e commit 1db8665

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/spi/spi-wpcm-fiu.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -449,21 +449,20 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
449449
fiu->dev = dev;
450450

451451
fiu->regs = devm_platform_ioremap_resource_byname(pdev, "control");
452-
if (IS_ERR(fiu->regs)) {
453-
dev_err(dev, "Failed to map registers\n");
454-
return PTR_ERR(fiu->regs);
455-
}
452+
if (IS_ERR(fiu->regs))
453+
return dev_err_probe(dev, PTR_ERR(fiu->regs),
454+
"Failed to map registers\n");
456455

457456
fiu->clk = devm_clk_get_enabled(dev, NULL);
458457
if (IS_ERR(fiu->clk))
459458
return PTR_ERR(fiu->clk);
460459

461-
fiu->memory = devm_platform_ioremap_resource_byname(pdev, "memory");
460+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
461+
fiu->memory = devm_ioremap_resource(dev, res);
462462
fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
463-
if (IS_ERR(fiu->memory)) {
464-
dev_err(dev, "Failed to map flash memory window\n");
465-
return PTR_ERR(fiu->memory);
466-
}
463+
if (IS_ERR(fiu->memory))
464+
return dev_err_probe(dev, PTR_ERR(fiu->memory),
465+
"Failed to map flash memory window\n");
467466

468467
fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");
469468

0 commit comments

Comments
 (0)