diff mbox series

ALSA: usb-audio: Add delay quirk for H570e USB headsets

Message ID 20200910085328.19188-1-joakim.tjernlund@infinera.com
State New
Headers show
Series ALSA: usb-audio: Add delay quirk for H570e USB headsets | expand

Commit Message

Joakim Tjernlund Sept. 10, 2020, 8:53 a.m. UTC
Needs the same delay as H650e

Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Cc: stable@vger.kernel.org
---
 sound/usb/quirks.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Sasha Levin Sept. 10, 2020, 4:34 p.m. UTC | #1
Hi

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.8.7, v5.4.63, v4.19.143, v4.14.196, v4.9.235, v4.4.235.

v5.8.7: Build OK!
v5.4.63: Build OK!
v4.19.143: Build OK!
v4.14.196: Build OK!
v4.9.235: Build OK!
v4.4.235: Failed to apply! Possible dependencies:
    71426535f49f ("ALSA: usb-audio: Add native DSD support for Luxman DA-06")
    74dc71f83e50 ("ALSA: usb-audio: FIX native DSD support for TEAC UD-501 DAC")
    79289e24194a ("ALSA: usb-audio: Refer to chip->usb_id for quirks and MIDI creation")
    7f38ca047b0c ("ALSA: usb-audio: Add native DSD support for TEAC 501/503 DAC")
    866f7ed7d679 ("ALSA: usb-audio: Add native DSD support for Esoteric D-05X")
    b00214865d65 ("ALSA: usb-audio: Add native DSD support for TEAC UD-301")
    df3f0347fd85 ("ALSA: usb-audio: quirks: Replace mdelay() with msleep() and usleep_range()")
    f3b906d720e4 ("ALSA: usb-audio: Integrate native DSD support for ITF-USB based DACs.")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?
Joakim Tjernlund Sept. 15, 2020, 1:54 p.m. UTC | #2
Ping? Was this accepted or dropped ?

   Joakim
On Thu, 2020-09-10 at 10:53 +0200, Joakim Tjernlund wrote:
> Needs the same delay as H650e

> 

> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>

> Cc: stable@vger.kernel.org

> ---

>  sound/usb/quirks.c | 7 ++++---

>  1 file changed, 4 insertions(+), 3 deletions(-)

> 

> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c

> index 75bbdc691243..892296df131d 100644

> --- a/sound/usb/quirks.c

> +++ b/sound/usb/quirks.c

> @@ -1678,12 +1678,13 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,

>  	    && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)

>  		msleep(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)
Takashi Iwai Sept. 21, 2020, 8:41 a.m. UTC | #3
On Thu, 10 Sep 2020 10:53:28 +0200,
Joakim Tjernlund wrote:
> 
> Needs the same delay as H650e
> 
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> Cc: stable@vger.kernel.org

Applied now.  Thanks.


Takashi
diff mbox series

Patch

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 75bbdc691243..892296df131d 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1678,12 +1678,13 @@  void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
 	    && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
 		msleep(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)