diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-04 08:45:42 +0100 |
| commit | 98cb621081705e2244ef6c265ff8a9f2208c7e2a (patch) | |
| tree | 6205be47a83d54d3e35e049b67973244120f8bd6 /drivers/watchdog/tqmx86_wdt.c | |
| parent | b844ff366f06a2bcecfbd053b4d4a472e670dec8 (diff) | |
| parent | 9dff0aa95a324e262ffb03f425d00e4751f3294e (diff) | |
| download | linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.gz linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.bz2 linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/watchdog/tqmx86_wdt.c')
| -rw-r--r-- | drivers/watchdog/tqmx86_wdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c index 0d3a0fbbd7a5..52941207a12a 100644 --- a/drivers/watchdog/tqmx86_wdt.c +++ b/drivers/watchdog/tqmx86_wdt.c @@ -79,13 +79,13 @@ static int tqmx86_wdt_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_IO, 0); - if (IS_ERR(res)) - return PTR_ERR(res); + if (!res) + return -ENODEV; priv->io_base = devm_ioport_map(&pdev->dev, res->start, resource_size(res)); - if (IS_ERR(priv->io_base)) - return PTR_ERR(priv->io_base); + if (!priv->io_base) + return -ENOMEM; watchdog_set_drvdata(&priv->wdd, priv); |