Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

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

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 17454ca653f42c6cc5154966f0da619094c8e594..0e731d797a2a3dc0adcd0074bc5beefe252bd8f2 100644 (file)
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -166,8 +166,12 @@ static int davinci_wdt_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        davinci_wdt->clk = devm_clk_get(dev, NULL);
-       if (WARN_ON(IS_ERR(davinci_wdt->clk)))
+
+       if (IS_ERR(davinci_wdt->clk)) {
+               if (PTR_ERR(davinci_wdt->clk) != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get clock node\n");
                return PTR_ERR(davinci_wdt->clk);
+       }
 
        clk_prepare_enable(davinci_wdt->clk);