From 30a5e60e7d23fba9c5c12ff93c022a6c236dd01f Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 21 Jun 2021 08:47:19 +0200 Subject: watchdog: dw_wdt: fix resource reservation error check dev_request_mem_resource returns a possible error pointer. If it succeeds mem->start will always be valid. Rectify the confusion. Signed-off-by: Ahmad Fatoum Link: https://lore.barebox.org/20210621064719.19246-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/watchdog/dw_wdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 70d6f0cced..774d211a5f 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -143,9 +143,10 @@ static int dw_wdt_drv_probe(struct device_d *dev) dw_wdt = xzalloc(sizeof(*dw_wdt)); mem = dev_request_mem_resource(dev, 0); + if (IS_ERR(mem)) + return PTR_ERR(mem); + dw_wdt->regs = IOMEM(mem->start); - if (IS_ERR(dw_wdt->regs)) - return PTR_ERR(dw_wdt->regs); clk = clk_get(dev, NULL); if (IS_ERR(clk)) -- cgit v1.2.3