Merge branch 'for-4.12/upstream-fixes' into for-linus

[mirror_ubuntu-artful-kernel.git] / drivers / watchdog / zx2967_wdt.c

diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
index e290d5a13a6d5fa621f650ef03f3b8d7f00f7bb5..c98252733c3069dc5528691cecdee279c8f35c5a 100644 (file)
--- a/drivers/watchdog/zx2967_wdt.c
+++ b/drivers/watchdog/zx2967_wdt.c
@@ -211,10 +211,8 @@ static int zx2967_wdt_probe(struct platform_device *pdev)
 
        base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        wdt->reg_base = devm_ioremap_resource(dev, base);
-       if (IS_ERR(wdt->reg_base)) {
-               dev_err(dev, "ioremap failed\n");
+       if (IS_ERR(wdt->reg_base))
                return PTR_ERR(wdt->reg_base);
-       }
 
        zx2967_wdt_reset_sysctrl(dev);