From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 23 Sep 2022 17:28:06 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.9.330~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=249fe0c1003bccbf5046b6182258d6bdb9ac7d13;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	alsa-hda-tegra-set-depop-delay-for-tegra.patch
	usb-core-fix-rst-error-in-hub.c.patch
---

diff --git a/queue-4.9/alsa-hda-tegra-set-depop-delay-for-tegra.patch b/queue-4.9/alsa-hda-tegra-set-depop-delay-for-tegra.patch
new file mode 100644
index 00000000000..3227bb70579
--- /dev/null
+++ b/queue-4.9/alsa-hda-tegra-set-depop-delay-for-tegra.patch
@@ -0,0 +1,31 @@
+From 3c4d8c24fb6c44f426e447b04800b0ed61a7b5ae Mon Sep 17 00:00:00 2001
+From: Mohan Kumar <mkumard@nvidia.com>
+Date: Tue, 13 Sep 2022 11:06:41 +0530
+Subject: ALSA: hda/tegra: set depop delay for tegra
+
+From: Mohan Kumar <mkumard@nvidia.com>
+
+commit 3c4d8c24fb6c44f426e447b04800b0ed61a7b5ae upstream.
+
+Reduce the suspend time by setting depop delay to 10ms for
+tegra.
+
+Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20220913053641.23299-1-mkumard@nvidia.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_hdmi.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -3247,6 +3247,7 @@ static int patch_tegra_hdmi(struct hda_c
+ 	if (err)
+ 		return err;
+ 
++	codec->depop_delay = 10;
+ 	codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
+ 	spec = codec->spec;
+ 	spec->chmap.ops.chmap_cea_alloc_validate_get_type =
diff --git a/queue-4.9/series b/queue-4.9/series
index 49b7875186e..545c83ebc7e 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -11,3 +11,5 @@ mips-pic32-pic32mzda-fix-refcount-leak-bugs.patch
 mips-lantiq-add-missing-of_node_put-in-irq.c.patch
 arm-mach-spear-add-missing-of_node_put-in-time.c.patch
 wifi-mac80211-fix-uaf-in-ieee80211_scan_rx.patch
+usb-core-fix-rst-error-in-hub.c.patch
+alsa-hda-tegra-set-depop-delay-for-tegra.patch
diff --git a/queue-4.9/usb-core-fix-rst-error-in-hub.c.patch b/queue-4.9/usb-core-fix-rst-error-in-hub.c.patch
new file mode 100644
index 00000000000..355d385c788
--- /dev/null
+++ b/queue-4.9/usb-core-fix-rst-error-in-hub.c.patch
@@ -0,0 +1,34 @@
+From 766a96dc558385be735a370db867e302c8f22153 Mon Sep 17 00:00:00 2001
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Thu, 1 Sep 2022 10:36:34 -0400
+Subject: USB: core: Fix RST error in hub.c
+
+From: Alan Stern <stern@rowland.harvard.edu>
+
+commit 766a96dc558385be735a370db867e302c8f22153 upstream.
+
+A recent commit added an invalid RST expression to a kerneldoc comment
+in hub.c.  The fix is trivial.
+
+Fixes: 9c6d778800b9 ("USB: core: Prevent nested device-reset calls")
+Cc: <stable@vger.kernel.org>
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Link: https://lore.kernel.org/r/YxDDcsLtRZ7c20pq@rowland.harvard.edu
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/core/hub.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -5702,7 +5702,7 @@ re_enumerate_no_bos:
+  *
+  * Return: The same as for usb_reset_and_verify_device().
+  * However, if a reset is already in progress (for instance, if a
+- * driver doesn't have pre_ or post_reset() callbacks, and while
++ * driver doesn't have pre_reset() or post_reset() callbacks, and while
+  * being unbound or re-bound during the ongoing reset its disconnect()
+  * or probe() routine tries to perform a second, nested reset), the
+  * routine returns -EINPROGRESS.