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

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

diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c
index dda1946e84dd4f52f0555aad4ab1a81bf4fa7c03..ee9574da53c059a86ed7942aaea24d96074e0faa 100644 (file)
--- a/drivers/clocksource/timer-probe.c
+++ b/drivers/clocksource/timer-probe.c
@@ -29,7 +29,9 @@ void __init timer_probe(void)
 
                ret = init_func_ret(np);
                if (ret) {
-                       pr_err("Failed to initialize '%pOF': %d\n", np, ret);
+                       if (ret != -EPROBE_DEFER)
+                               pr_err("Failed to initialize '%pOF': %d\n", np,
+                                      ret);
                        continue;
                }