diff options
| author | Guillaume Fougnies <guillaume@eulerian.com> | 2016-01-26 00:28:27 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-15 15:42:31 -0500 |
| commit | 423cdecb49ff6968ef08098674f2f68e685f11cc (patch) | |
| tree | 52a51755854f35ab112ebe83476d5b0de3a3cf7f /sound/usb/quirks.c | |
| parent | 0b864967ee24197a9062f812e6d62e580a490776 (diff) | |
| download | lwn-423cdecb49ff6968ef08098674f2f68e685f11cc.tar.gz lwn-423cdecb49ff6968ef08098674f2f68e685f11cc.zip | |
ALSA: usb-audio: Fix TEAC UD-501/UD-503/NT-503 usb delay
[ Upstream commit 5a4ff9ec8d6edd2ab1cfe8ce6a080d6e57cbea9a ]
TEAC UD-501/UD-503/NT-503 fail to switch properly between different
rate/format. Similar to 'Playback Design', this patch corrects the
invalid clock source error for TEAC products and avoids complete
freeze of the usb interface of 503 series.
Signed-off-by: Guillaume Fougnies <guillaume@eulerian.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 2c10c9ee36a2..2ed5fe6f9c75 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1190,8 +1190,12 @@ void snd_usb_set_interface_quirk(struct usb_device *dev) * "Playback Design" products need a 50ms delay after setting the * USB interface. */ - if (le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) + switch (le16_to_cpu(dev->descriptor.idVendor)) { + case 0x23ba: /* Playback Design */ + case 0x0644: /* TEAC Corp. */ mdelay(50); + break; + } } void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, @@ -1206,6 +1210,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) mdelay(20); + /* + * "TEAC Corp." products need a 20ms delay after each + * class compliant request + */ + if ((le16_to_cpu(dev->descriptor.idVendor) == 0x0644) && + (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) + mdelay(20); + /* Marantz/Denon devices with USB DAC functionality need a delay * after each class compliant request */ |