]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Aug 2019 12:32:42 +0000 (05:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Aug 2019 12:32:42 +0000 (05:32 -0700)
added patches:
mmc-sdhci-of-arasan-do-now-show-error-message-in-case-of-deffered-probe.patch

queue-4.14/mmc-sdhci-of-arasan-do-now-show-error-message-in-case-of-deffered-probe.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/mmc-sdhci-of-arasan-do-now-show-error-message-in-case-of-deffered-probe.patch b/queue-4.14/mmc-sdhci-of-arasan-do-now-show-error-message-in-case-of-deffered-probe.patch
new file mode 100644 (file)
index 0000000..b810960
--- /dev/null
@@ -0,0 +1,33 @@
+From 60208a267208c27fa3f23dfd36cbda180471fa98 Mon Sep 17 00:00:00 2001
+From: Michal Simek <michal.simek@xilinx.com>
+Date: Mon, 6 Aug 2018 10:43:10 +0200
+Subject: mmc: sdhci-of-arasan: Do now show error message in case of deffered probe
+
+From: Michal Simek <michal.simek@xilinx.com>
+
+commit 60208a267208c27fa3f23dfd36cbda180471fa98 upstream.
+
+When mmc-pwrseq property is passed mmc_pwrseq_alloc() can return
+-EPROBE_DEFER because driver for power sequence provider is not probed
+yet. Do not show error message when this situation happens.
+
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/host/sdhci-of-arasan.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/sdhci-of-arasan.c
++++ b/drivers/mmc/host/sdhci-of-arasan.c
+@@ -638,7 +638,8 @@ static int sdhci_arasan_probe(struct pla
+       ret = mmc_of_parse(host->mmc);
+       if (ret) {
+-              dev_err(&pdev->dev, "parsing dt failed (%d)\n", ret);
++              if (ret != -EPROBE_DEFER)
++                      dev_err(&pdev->dev, "parsing dt failed (%d)\n", ret);
+               goto unreg_clk;
+       }
index 84fe4a463e177edcf3b88bfa0a60bca08bb56d64..c7561c4211762d2718a965957d12b6b94bc6ec25 100644 (file)
@@ -68,3 +68,4 @@ net-mlx5e-only-support-tx-rx-pause-setting-for-port-owner.patch
 net-mlx5e-use-flow-keys-dissector-to-parse-packets-for-arfs.patch
 team-add-vlan-tx-offload-to-hw_enc_features.patch
 bonding-add-vlan-tx-offload-to-hw_enc_features.patch
+mmc-sdhci-of-arasan-do-now-show-error-message-in-case-of-deffered-probe.patch