Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

[linux.git] / drivers / clocksource / timer-of.c

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index 80542289fae7b34de7a7137d21a33a38f673e993..d8c2bd4391d027acf9f4609153a39514e7043f3a 100644 (file)
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -113,8 +113,10 @@ static __init int timer_of_clk_init(struct device_node *np,
        of_clk->clk = of_clk->name ? of_clk_get_by_name(np, of_clk->name) :
                of_clk_get(np, of_clk->index);
        if (IS_ERR(of_clk->clk)) {
-               pr_err("Failed to get clock for %pOF\n", np);
-               return PTR_ERR(of_clk->clk);
+               ret = PTR_ERR(of_clk->clk);
+               if (ret != -EPROBE_DEFER)
+                       pr_err("Failed to get clock for %pOF\n", np);
+               goto out;
        }
 
        ret = clk_prepare_enable(of_clk->clk);