diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-06-21 08:47:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-21 09:56:52 +0200 |
| commit | 30a5e60e7d23fba9c5c12ff93c022a6c236dd01f (patch) | |
| tree | 908edbc5cf7dcc84bd1a565bcf100958fe0e1ea4 | |
| parent | 2778b034cab5836dd2bff14476a6ea382a14db43 (diff) | |
| download | barebox-30a5e60e7d23fba9c5c12ff93c022a6c236dd01f.tar.gz barebox-30a5e60e7d23fba9c5c12ff93c022a6c236dd01f.tar.xz | |
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 <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20210621064719.19246-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/watchdog/dw_wdt.c | 5 |
1 files 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)) |