Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[karo-tx-linux.git] / drivers / clk / clk-conf.c

diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
index 674785d968a3e1c507637ebbeb3865e17fcb5def..e0e02a6e59009e7ac56ae85ddaecc8624568e5b3 100644 (file)
--- a/drivers/clk/clk-conf.c
+++ b/drivers/clk/clk-conf.c
@@ -40,8 +40,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
                        return 0;
                pclk = of_clk_get_from_provider(&clkspec);
                if (IS_ERR(pclk)) {
-                       pr_warn("clk: couldn't get parent clock %d for %s\n",
-                               index, node->full_name);
+                       if (PTR_ERR(pclk) != -EPROBE_DEFER)
+                               pr_warn("clk: couldn't get parent clock %d for %s\n",
+                                       index, node->full_name);
                        return PTR_ERR(pclk);
                }
 
@@ -55,8 +56,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
                }
                clk = of_clk_get_from_provider(&clkspec);
                if (IS_ERR(clk)) {
-                       pr_warn("clk: couldn't get assigned clock %d for %s\n",
-                               index, node->full_name);
+                       if (PTR_ERR(clk) != -EPROBE_DEFER)
+                               pr_warn("clk: couldn't get assigned clock %d for %s\n",
+                                       index, node->full_name);
                        rc = PTR_ERR(clk);
                        goto err;
                }
@@ -99,8 +101,9 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)
 
                        clk = of_clk_get_from_provider(&clkspec);
                        if (IS_ERR(clk)) {
-                               pr_warn("clk: couldn't get clock %d for %s\n",
-                                       index, node->full_name);
+                               if (PTR_ERR(clk) != -EPROBE_DEFER)
+                                       pr_warn("clk: couldn't get clock %d for %s\n",
+                                               index, node->full_name);
                                return PTR_ERR(clk);
                        }