aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2018-04-09 10:13:03 -0400
committerStephen Boyd <sboyd@kernel.org>2018-05-15 18:16:13 -0400
commit329470f2d5447f76088250d7b7fbc1f9b175ccfc (patch)
tree6dc33f988230729b8a8138b3aee8f8bdc60a98a8
parent60cc43fc888428bb2f18f08997432d426a243338 (diff)
clk: bulk: silently error out on EPROBE_DEFER
In clk_bulk_get(), if we fail to get the clock due to probe deferal, we shouldn't print an error message. Just be silent in this case. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/clk-bulk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index 4c10456f8a32..6904ed6da504 100644
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -42,8 +42,9 @@ int __must_check clk_bulk_get(struct device *dev, int num_clks,
42 clks[i].clk = clk_get(dev, clks[i].id); 42 clks[i].clk = clk_get(dev, clks[i].id);
43 if (IS_ERR(clks[i].clk)) { 43 if (IS_ERR(clks[i].clk)) {
44 ret = PTR_ERR(clks[i].clk); 44 ret = PTR_ERR(clks[i].clk);
45 dev_err(dev, "Failed to get clk '%s': %d\n", 45 if (ret != -EPROBE_DEFER)
46 clks[i].id, ret); 46 dev_err(dev, "Failed to get clk '%s': %d\n",
47 clks[i].id, ret);
47 clks[i].clk = NULL; 48 clks[i].clk = NULL;
48 goto err; 49 goto err;
49 } 50 }