4.4-stable patches

added patches:
	scsi-ufs-fix-ufshcd_probe_hba-reture-value-in-case-ufshcd_scsi_add_wlus-fails.patch

diff --git a/queue-4.4/asoc-pcm-update-fe-be-trigger-order-based-on-the-com.patch b/queue-4.4/asoc-pcm-update-fe-be-trigger-order-based-on-the-com.patch
index b1534a31df20cd99360c7ea2d186899b0fe8dfa6..98aac97a3d4e9521e745e6d1d9bd3b90e09b814d 100644 (file)
--- a/queue-4.4/asoc-pcm-update-fe-be-trigger-order-based-on-the-com.patch
+++ b/queue-4.4/asoc-pcm-update-fe-be-trigger-order-based-on-the-com.patch
@@ -44,14 +44,12 @@ Link: https://lore.kernel.org/r/20191104224812.3393-2-ranjani.sridharan@linux.in
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- sound/soc/soc-pcm.c | 95 ++++++++++++++++++++++++++++++++-------------
+ sound/soc/soc-pcm.c |   95 +++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 68 insertions(+), 27 deletions(-)
 
-diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
-index dbdea1975f90c..81bedd9bb922b 100644
 --- a/sound/soc/soc-pcm.c
 +++ b/sound/soc/soc-pcm.c
-@@ -2026,42 +2026,81 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
+@@ -2026,42 +2026,81 @@ int dpcm_be_dai_trigger(struct snd_soc_p
  }
  EXPORT_SYMBOL_GPL(dpcm_be_dai_trigger);
  
@@ -156,7 +154,7 @@ index dbdea1975f90c..81bedd9bb922b 100644
                break;
        case SND_SOC_DPCM_TRIGGER_BESPOKE:
                /* bespoke trigger() - handles both FE and BEs */
-@@ -2070,10 +2109,6 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd)
+@@ -2070,10 +2109,6 @@ static int dpcm_fe_dai_do_trigger(struct
                                fe->dai_link->name, cmd);
  
                ret = soc_pcm_bespoke_trigger(substream, cmd);
@@ -167,7 +165,7 @@ index dbdea1975f90c..81bedd9bb922b 100644
                break;
        default:
                dev_err(fe->dev, "ASoC: invalid trigger cmd %d for %s\n", cmd,
-@@ -2082,6 +2117,12 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd)
+@@ -2082,6 +2117,12 @@ static int dpcm_fe_dai_do_trigger(struct
                goto out;
        }
  
@@ -180,6 +178,3 @@ index dbdea1975f90c..81bedd9bb922b 100644
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
        case SNDRV_PCM_TRIGGER_RESUME:
--- 
-2.20.1
-

diff --git a/queue-4.4/scsi-ufs-fix-ufshcd_probe_hba-reture-value-in-case-ufshcd_scsi_add_wlus-fails.patch b/queue-4.4/scsi-ufs-fix-ufshcd_probe_hba-reture-value-in-case-ufshcd_scsi_add_wlus-fails.patch
new file mode 100644 (file)
index 0000000..9c5b6d7
--- /dev/null
+++ b/queue-4.4/scsi-ufs-fix-ufshcd_probe_hba-reture-value-in-case-ufshcd_scsi_add_wlus-fails.patch
@@ -0,0 +1,39 @@
+From b9fc5320212efdfb4e08b825aaa007815fd11d16 Mon Sep 17 00:00:00 2001
+From: Bean Huo <beanhuo@micron.com>
+Date: Mon, 20 Jan 2020 14:08:13 +0100
+Subject: scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails
+
+From: Bean Huo <beanhuo@micron.com>
+
+commit b9fc5320212efdfb4e08b825aaa007815fd11d16 upstream.
+
+A non-zero error value likely being returned by ufshcd_scsi_add_wlus() in
+case of failure of adding the WLs, but ufshcd_probe_hba() doesn't use this
+value, and doesn't report this failure to upper caller.  This patch is to
+fix this issue.
+
+Fixes: 2a8fa600445c ("ufs: manually add well known logical units")
+Link: https://lore.kernel.org/r/20200120130820.1737-2-huobean@gmail.com
+Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
+Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
+Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
+Signed-off-by: Bean Huo <beanhuo@micron.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/ufs/ufshcd.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/scsi/ufs/ufshcd.c
++++ b/drivers/scsi/ufs/ufshcd.c
+@@ -4324,7 +4324,8 @@ static int ufshcd_probe_hba(struct ufs_h
+                       ufshcd_init_icc_levels(hba);
+ 
+               /* Add required well known logical units to scsi mid layer */
+-              if (ufshcd_scsi_add_wlus(hba))
++              ret = ufshcd_scsi_add_wlus(hba);
++              if (ret)
+                       goto out;
+ 
+               scsi_scan_host(hba->host);

diff --git a/queue-4.4/series b/queue-4.4/series
index aa0518b10e99dabc87f2b288d1781978a8054549..a1efa7e3315befdb67deea6b950d37c2457333cf 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -77,3 +77,4 @@ cifs-fail-i-o-on-soft-mounts-if-sessionsetup-errors-out.patch
 clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch
 perf-core-fix-mlock-accounting-in-perf_mmap.patch
 asoc-pcm-update-fe-be-trigger-order-based-on-the-com.patch
+scsi-ufs-fix-ufshcd_probe_hba-reture-value-in-case-ufshcd_scsi_add_wlus-fails.patch