Hi,
here are two trivial USB-audio patches I adapted the upstream commits for the older kernels up to 5.14.y. Feel free cherry-pick to 5.10.y and older trees as long as applicable.
thanks,
Takashi
===
Takashi Iwai (2): ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
sound/usb/mixer_maps.c | 8 ++++++++ 1 file changed, 8 insertions(+)
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 --- sound/usb/mixer_maps.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index c5794e83fd80..809ac6d18d2b 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -538,6 +538,10 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x25c4, 0x0003), .map = scms_usb3318_map, }, + { + .id = USB_ID(0x30be, 0x0101), /* Schiit Hel */ + .ignore_ctl_error = 1, + }, { /* Bose Companion 5 */ .id = USB_ID(0x05a7, 0x1020),
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 --- sound/usb/mixer_maps.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 809ac6d18d2b..8f6823df944f 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -528,6 +528,10 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x2573, 0x0008), .map = maya44_map, }, + { + .id = USB_ID(0x2708, 0x0002), /* Audient iD14 */ + .ignore_ctl_error = 1, + }, { /* KEF X300A */ .id = USB_ID(0x27ac, 0x1000),
On Thu, Nov 04, 2021 at 12:23:07PM +0100, Takashi Iwai wrote:
Hi,
here are two trivial USB-audio patches I adapted the upstream commits for the older kernels up to 5.14.y. Feel free cherry-pick to 5.10.y and older trees as long as applicable.
thanks,
Takashi
===
Takashi Iwai (2): ALSA: usb-audio: Add Schiit Hel device to mixer map quirk table ALSA: usb-audio: Add Audient iD14 to mixer map quirk table
sound/usb/mixer_maps.c | 8 ++++++++ 1 file changed, 8 insertions(+)
All now queued up, thanks!
greg k-h
linux-stable-mirror@lists.linaro.org
-
Greg Kroah-Hartman -
Takashi Iwai