5.10-stable patches

added patches:
	asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch

diff --git a/queue-5.10/asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch b/queue-5.10/asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch
new file mode 100644 (file)
index 0000000..6f2d1bb
--- /dev/null
+++ b/queue-5.10/asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch
@@ -0,0 +1,52 @@
+From 9266d95405ae0c078f188ec8bca3a004631be429 Mon Sep 17 00:00:00 2001
+From: Oder Chiou <oder_chiou@realtek.com>
+Date: Mon, 7 Jun 2021 17:22:36 -0500
+Subject: ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire
+
+From: Oder Chiou <oder_chiou@realtek.com>
+
+commit 9266d95405ae0c078f188ec8bca3a004631be429 upstream.
+
+The device checking error should be a jump to pm_runtime_put_autosuspend()
+as done before returning value.
+
+Fixes: 867f8d18df4f ('ASoC: rt5682: fix getting the wrong device id when the suspend_stress_test')
+Reviewed-by: Bard Liao <bard.liao@intel.com>
+Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20210607222239.582139-13-pierre-louis.bossart@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/codecs/rt5682-sdw.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/sound/soc/codecs/rt5682-sdw.c
++++ b/sound/soc/codecs/rt5682-sdw.c
+@@ -413,9 +413,11 @@ static int rt5682_io_init(struct device
+               usleep_range(30000, 30005);
+               loop--;
+       }
++
+       if (val != DEVICE_ID) {
+               dev_err(dev, "Device with ID register %x is not rt5682\n", val);
+-              return -ENODEV;
++              ret = -ENODEV;
++              goto err_nodev;
+       }
+ 
+       rt5682_calibrate(rt5682);
+@@ -486,10 +488,11 @@ reinit:
+       rt5682->hw_init = true;
+       rt5682->first_hw_init = true;
+ 
++err_nodev:
+       pm_runtime_mark_last_busy(&slave->dev);
+       pm_runtime_put_autosuspend(&slave->dev);
+ 
+-      dev_dbg(&slave->dev, "%s hw_init complete\n", __func__);
++      dev_dbg(&slave->dev, "%s hw_init complete: %d\n", __func__, ret);
+ 
+       return ret;
+ }

diff --git a/queue-5.10/series b/queue-5.10/series
index ccd0d5cc5c724b8a3705c78447138f22f83d39c4..e1def0428c44c1640f6bf6d8171bfe3713dddd9c 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -20,3 +20,4 @@ fsi-master-ast-cf-add-module_firmware-macro.patch
 nilfs2-fix-general-protection-fault-in-nilfs_lookup_dirty_data_buffers.patch
 nilfs2-fix-warning-in-mark_buffer_dirty-due-to-discarded-buffer-reuse.patch
 pinctrl-amd-don-t-show-invalid-config-param-errors.patch
+asoc-rt5682-fix-a-problem-with-error-handling-in-the-io-init-function-of-the-soundwire.patch