Merge tag 'platform-drivers-x86-v5.4-2' of git://git.infradead.org/linux-platform...

[linux.git] / drivers / watchdog / imx2_wdt.c

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index a606005dd65f17290185704141b9795972d78429..32af3974e6bb687a2b2499d75e32e5128a67de5f 100644 (file)
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -316,10 +316,8 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
        regmap_write(wdev->regmap, IMX2_WDT_WMCR, 0);
 
        ret = watchdog_register_device(wdog);
-       if (ret) {
-               dev_err(&pdev->dev, "cannot register watchdog device\n");
+       if (ret)
                goto disable_clk;
-       }
 
        dev_info(&pdev->dev, "timeout %d sec (nowayout=%d)\n",
                 wdog->timeout, nowayout);