]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Nov 2021 12:09:28 +0000 (13:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Nov 2021 12:09:28 +0000 (13:09 +0100)
added patches:
alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch
alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch

queue-5.10/alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch [new file with mode: 0644]
queue-5.10/alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch b/queue-5.10/alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch
new file mode 100644 (file)
index 0000000..128f78d
--- /dev/null
@@ -0,0 +1,41 @@
+From foo@baz Thu Nov  4 01:08:24 PM CET 2021
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu,  4 Nov 2021 12:23:09 +0100
+Subject: ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
+To: stable@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org
+Message-ID: <20211104112309.30984-3-tiwai@suse.de>
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit df0380b9539b04c1ae8854a984098da06d5f1e67 upstream.
+
+This is a fix equivalent with the upstream commit df0380b9539b ("ALSA:
+usb-audio: Add quirk for Audient iD14"), adapted to the earlier
+kernels up to 5.14.y.  It adds the quirk entry with the old
+ignore_ctl_error flag to the usbmix_ctl_maps, instead.
+
+The original commit description says:
+    Audient iD14 (2708:0002) may get a control message error that
+    interferes the operation e.g. with alsactl.  Add the quirk to ignore
+    such errors like other devices.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/mixer_maps.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/usb/mixer_maps.c
++++ b/sound/usb/mixer_maps.c
+@@ -529,6 +529,10 @@ static const struct usbmix_ctl_map usbmi
+               .map = maya44_map,
+       },
+       {
++              .id = USB_ID(0x2708, 0x0002), /* Audient iD14 */
++              .ignore_ctl_error = 1,
++      },
++      {
+               /* KEF X300A */
+               .id = USB_ID(0x27ac, 0x1000),
+               .map = scms_usb3318_map,
diff --git a/queue-5.10/alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch b/queue-5.10/alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch
new file mode 100644 (file)
index 0000000..1ddcde0
--- /dev/null
@@ -0,0 +1,48 @@
+From foo@baz Thu Nov  4 01:08:24 PM CET 2021
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu,  4 Nov 2021 12:23:08 +0100
+Subject: ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table
+To: stable@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org
+Message-ID: <20211104112309.30984-2-tiwai@suse.de>
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 22390ce786c59328ccd13c329959dee1e8757487 upstream.
+
+This is a fix equivalent with the upstream commit 22390ce786c5 ("ALSA:
+usb-audio: add Schiit Hel device to quirk table"), adapted to the
+earlier kernels up to 5.14.y.  It adds the quirk entry with the old
+ignore_ctl_error flag to the usbmix_ctl_maps, instead.
+
+The original patch description says:
+    The Shciit Hel device responds to the ctl message for the mic capture
+    switch with a timeout of -EPIPE:
+
+            usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+            usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+            usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+            usb 7-2.2: cannot get ctl value: req = 0x81, wValue = 0x100, wIndex = 0x1100, type = 1
+
+    This seems safe to ignore as the device works properly with the control
+    message quirk, so add it to the quirk table so all is good.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/mixer_maps.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sound/usb/mixer_maps.c
++++ b/sound/usb/mixer_maps.c
+@@ -539,6 +539,10 @@ static const struct usbmix_ctl_map usbmi
+               .map = scms_usb3318_map,
+       },
+       {
++              .id = USB_ID(0x30be, 0x0101), /*  Schiit Hel */
++              .ignore_ctl_error = 1,
++      },
++      {
+               /* Bose Companion 5 */
+               .id = USB_ID(0x05a7, 0x1020),
+               .map = bose_companion5_map,
index 5f662b879382b29a873f2c735e12851a84b64b48..610c03f59b60a93d2ef9b9cb31ed2c6355e50047 100644 (file)
@@ -12,3 +12,5 @@ mm-khugepaged-skip-huge-page-collapse-for-special-files.patch
 revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch
 arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch
 revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch
+alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch
+alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch