From: Greg Kroah-Hartman Date: Thu, 4 Nov 2021 12:09:28 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.19.216~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f47af667239d9d386923ff47d724bc47aba24a6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches 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 --- 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 index 00000000000..128f78ddcb2 --- /dev/null +++ b/queue-5.10/alsa-usb-audio-add-audient-id14-to-mixer-map-quirk-table.patch @@ -0,0 +1,41 @@ +From foo@baz Thu Nov 4 01:08:24 PM CET 2021 +From: Takashi Iwai +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 , linux-kernel@vger.kernel.org +Message-ID: <20211104112309.30984-3-tiwai@suse.de> + +From: Takashi Iwai + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 index 00000000000..1ddcde05f42 --- /dev/null +++ b/queue-5.10/alsa-usb-audio-add-schiit-hel-device-to-mixer-map-quirk-table.patch @@ -0,0 +1,48 @@ +From foo@baz Thu Nov 4 01:08:24 PM CET 2021 +From: Takashi Iwai +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 , linux-kernel@vger.kernel.org +Message-ID: <20211104112309.30984-2-tiwai@suse.de> + +From: Takashi Iwai + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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, diff --git a/queue-5.10/series b/queue-5.10/series index 5f662b87938..610c03f59b6 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -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