Commit 1db86650 authored by Mark Brown's avatar Mark Brown

spi: wpcm-fiu: Fix uninitialized res

Merge series from Jinjie Ruan <ruanjinjie@huawei.com>:

Fix uninitialized res in probe function.
parents 3959d1f0 196d34e2
...@@ -449,21 +449,20 @@ static int wpcm_fiu_probe(struct platform_device *pdev) ...@@ -449,21 +449,20 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
fiu->dev = dev; fiu->dev = dev;
fiu->regs = devm_platform_ioremap_resource_byname(pdev, "control"); fiu->regs = devm_platform_ioremap_resource_byname(pdev, "control");
if (IS_ERR(fiu->regs)) { if (IS_ERR(fiu->regs))
dev_err(dev, "Failed to map registers\n"); return dev_err_probe(dev, PTR_ERR(fiu->regs),
return PTR_ERR(fiu->regs); "Failed to map registers\n");
}
fiu->clk = devm_clk_get_enabled(dev, NULL); fiu->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(fiu->clk)) if (IS_ERR(fiu->clk))
return PTR_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); fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
if (IS_ERR(fiu->memory)) { if (IS_ERR(fiu->memory))
dev_err(dev, "Failed to map flash memory window\n"); return dev_err_probe(dev, PTR_ERR(fiu->memory),
return PTR_ERR(fiu->memory); "Failed to map flash memory window\n");
}
fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm"); fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment