summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2021-10-30 19:58:11 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2021-11-01 11:33:07 +0100
commit7118e4117c3f0ac62e16ce361422a7efa1704b7b (patch)
tree60d3e39dde05bb68207775cbf24f1aad36f374bb
parent9338d313d3ffc7437036af6ffbd4edb153b67f79 (diff)
downloadbarebox-7118e4117c3f0ac62e16ce361422a7efa1704b7b.tar.gz
barebox-7118e4117c3f0ac62e16ce361422a7efa1704b7b.tar.xz
reset: socfpga: error out on failure to request memory
IOMEM() can't fail, but dev_request_mem_resource() can. Fix the error check. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20211030175812.2276705-9-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/reset/reset-socfpga.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 073f8faea8..56d301378f 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -88,9 +88,10 @@ static int socfpga_reset_probe(struct device_d *dev)
data = xzalloc(sizeof(*data));
res = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(res))
+ return PTR_ERR(res);
+
data->membase = IOMEM(res->start);
- if (IS_ERR(data->membase))
- return PTR_ERR(data->membase);
if (of_property_read_u32(np, "altr,modrst-offset", &modrst_offset)) {
dev_warn(dev, "missing altr,modrst-offset property, assuming 0x10!\n");