Skip to content

Commit 356ed04

Browse files
Wei Yongjunrafaeljw
authored andcommitted
watchdog: wdat_wdt: fix return value check in wdat_wdt_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent bba6529 commit 356ed04

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/watchdog/wdat_wdt.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,17 @@ static int wdat_wdt_probe(struct platform_device *pdev)
351351
res = &pdev->resource[i];
352352
if (resource_type(res) == IORESOURCE_MEM) {
353353
reg = devm_ioremap_resource(&pdev->dev, res);
354+
if (IS_ERR(reg))
355+
return PTR_ERR(reg);
354356
} else if (resource_type(res) == IORESOURCE_IO) {
355357
reg = devm_ioport_map(&pdev->dev, res->start, 1);
358+
if (!reg)
359+
return -ENOMEM;
356360
} else {
357361
dev_err(&pdev->dev, "Unsupported resource\n");
358362
return -EINVAL;
359363
}
360364

361-
if (!reg)
362-
return -ENOMEM;
363-
364365
regs[i] = reg;
365366
}
366367

0 commit comments

Comments
 (0)