diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2016-09-28 23:15:54 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-28 23:15:54 +0200 |
| commit | 356ed043517dbceb646a9353831abde91062a395 (patch) | |
| tree | 0bc4785cf97f7a1e99b9efa55ea77181efa136c0 /drivers/watchdog/wdat_wdt.c | |
| parent | platform/x86: intel_pmc_ipc: Do not create iTCO watchdog when WDAT table exists (diff) | |
| download | linux-dev-356ed043517dbceb646a9353831abde91062a395.tar.xz linux-dev-356ed043517dbceb646a9353831abde91062a395.zip | |
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>
Diffstat (limited to 'drivers/watchdog/wdat_wdt.c')
| -rw-r--r-- | drivers/watchdog/wdat_wdt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index 6b6464596674..4594723c27ba 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -351,16 +351,17 @@ static int wdat_wdt_probe(struct platform_device *pdev) res = &pdev->resource[i]; if (resource_type(res) == IORESOURCE_MEM) { reg = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(reg)) + return PTR_ERR(reg); } else if (resource_type(res) == IORESOURCE_IO) { reg = devm_ioport_map(&pdev->dev, res->start, 1); + if (!reg) + return -ENOMEM; } else { dev_err(&pdev->dev, "Unsupported resource\n"); return -EINVAL; } - if (!reg) - return -ENOMEM; - regs[i] = reg; } |