From: Greg Kroah-Hartman Date: Mon, 28 Sep 2020 13:33:16 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.238~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e2453d8b9db48f142d9242599c26bf0989b5029;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch --- diff --git a/queue-4.9/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch b/queue-4.9/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch new file mode 100644 index 00000000000..02cdc0f20c8 --- /dev/null +++ b/queue-4.9/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch @@ -0,0 +1,40 @@ +From 315c7ad7a701baba28c628c4c5426b3d9617ceed Mon Sep 17 00:00:00 2001 +From: Joakim Tjernlund +Date: Thu, 10 Sep 2020 10:53:28 +0200 +Subject: ALSA: usb-audio: Add delay quirk for H570e USB headsets + +From: Joakim Tjernlund + +commit 315c7ad7a701baba28c628c4c5426b3d9617ceed upstream. + +Needs the same delay as H650e + +Signed-off-by: Joakim Tjernlund +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20200910085328.19188-1-joakim.tjernlund@infinera.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/quirks.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/sound/usb/quirks.c ++++ b/sound/usb/quirks.c +@@ -1320,12 +1320,13 @@ void snd_usb_ctl_msg_quirk(struct usb_de + && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) + mdelay(20); + +- /* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny +- * delay here, otherwise requests like get/set frequency return as +- * failed despite actually succeeding. ++ /* Zoom R16/24, Logitech H650e/H570e, Jabra 550a, Kingston HyperX ++ * needs a tiny delay here, otherwise requests like get/set ++ * frequency return as failed despite actually succeeding. + */ + if ((chip->usb_id == USB_ID(0x1686, 0x00dd) || + chip->usb_id == USB_ID(0x046d, 0x0a46) || ++ chip->usb_id == USB_ID(0x046d, 0x0a56) || + chip->usb_id == USB_ID(0x0b0e, 0x0349) || + chip->usb_id == USB_ID(0x0951, 0x16ad)) && + (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) diff --git a/queue-4.9/series b/queue-4.9/series index 8e492f0c213..c6397b470d8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -15,6 +15,7 @@ scsi-aacraid-fix-illegal-io-beyond-last-lba.patch m68k-q40-fix-info-leak-in-rtc_ioctl.patch gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch asoc-kirkwood-fix-irq-error-handling.patch +alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch clk-ti-adpll-allocate-room-for-terminating-null.patch mtd-cfi_cmdset_0002-don-t-free-cfi-cfiq-in-error-pat.patch