Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / drivers / watchdog / sprd_wdt.c

diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
index 916fb3f..edba4e2 100644 (file)
--- a/drivers/watchdog/sprd_wdt.c
+++ b/drivers/watchdog/sprd_wdt.c
@@ -320,7 +320,6 @@ static int sprd_wdt_probe(struct platform_device *pdev)
        ret = devm_watchdog_register_device(dev, &wdt->wdd);
        if (ret) {
                sprd_wdt_disable(wdt);
-               dev_err(dev, "failed to register watchdog\n");
                return ret;
        }
        platform_set_drvdata(pdev, wdt);