Commit 356ed043 authored by Wei Yongjun's avatar Wei Yongjun Committed by Rafael J. Wysocki

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: default avatarWei Yongjun <weiyongjun1@huawei.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bba6529e
...@@ -351,16 +351,17 @@ static int wdat_wdt_probe(struct platform_device *pdev) ...@@ -351,16 +351,17 @@ static int wdat_wdt_probe(struct platform_device *pdev)
res = &pdev->resource[i]; res = &pdev->resource[i];
if (resource_type(res) == IORESOURCE_MEM) { if (resource_type(res) == IORESOURCE_MEM) {
reg = devm_ioremap_resource(&pdev->dev, res); reg = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(reg))
return PTR_ERR(reg);
} else if (resource_type(res) == IORESOURCE_IO) { } else if (resource_type(res) == IORESOURCE_IO) {
reg = devm_ioport_map(&pdev->dev, res->start, 1); reg = devm_ioport_map(&pdev->dev, res->start, 1);
if (!reg)
return -ENOMEM;
} else { } else {
dev_err(&pdev->dev, "Unsupported resource\n"); dev_err(&pdev->dev, "Unsupported resource\n");
return -EINVAL; return -EINVAL;
} }
if (!reg)
return -ENOMEM;
regs[i] = reg; regs[i] = reg;
} }
......
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