Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-08-08 12:22:02 +0200
committerMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-08-08 12:22:19 +0200
commite2ec8c59c0f5b08bfa464c00926fc403f93f1339 (patch)
treeec7c4c1db90aa9b8eafe86d4b6d6b1c47855fddb
parent884e2c703e7e59b4d198d8621986fea4e5bafdfa (diff)
clk: bulk: silently error out on EPROBE_DEFER
(bsc#1144718,bsc#1144813).
-rw-r--r--patches.drivers/0003-clk-bulk-silently-error-out-on-EPROBE_DEFER.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/0003-clk-bulk-silently-error-out-on-EPROBE_DEFER.patch b/patches.drivers/0003-clk-bulk-silently-error-out-on-EPROBE_DEFER.patch
new file mode 100644
index 0000000000..e10f3e2a2a
--- /dev/null
+++ b/patches.drivers/0003-clk-bulk-silently-error-out-on-EPROBE_DEFER.patch
@@ -0,0 +1,38 @@
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 9 Apr 2018 16:13:03 +0200
+Subject: clk: bulk: silently error out on EPROBE_DEFER
+
+Git-commit: 329470f2d5447f76088250d7b7fbc1f9b175ccfc
+Patch-mainline: v4.18-rc1
+References: bsc#1144718,bsc#1144813
+
+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>
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ drivers/clk/clk-bulk.c | 5 +++--
+ 1 file 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,
+ clks[i].clk = clk_get(dev, clks[i].id);
+ if (IS_ERR(clks[i].clk)) {
+ ret = PTR_ERR(clks[i].clk);
+- dev_err(dev, "Failed to get clk '%s': %d\n",
+- clks[i].id, ret);
++ if (ret != -EPROBE_DEFER)
++ dev_err(dev, "Failed to get clk '%s': %d\n",
++ clks[i].id, ret);
+ clks[i].clk = NULL;
+ goto err;
+ }
+--
+2.11.0
+
diff --git a/series.conf b/series.conf
index cc5682d03b..6c964262e9 100644
--- a/series.conf
+++ b/series.conf
@@ -17251,6 +17251,7 @@
patches.fixes/md-raid1-add-error-handling-of-read-error-from-FailF.patch
patches.drivers/0005-soc-rockchip-power-domain-Use-of_clk_get_parent_coun.patch
patches.drivers/clk-qcom-Base-rcg-parent-rate-off-plan-frequency
+ patches.drivers/0003-clk-bulk-silently-error-out-on-EPROBE_DEFER.patch
patches.drivers/clk-imx7d-fix-mipi-dphy-div-parent
patches.drivers/clk-mvebu-use-correct-bit-for-98DX3236-NAND
patches.drivers/clk-at91-PLL-recalc_rate-now-using-cached-MUL-and-DI