summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Fougnies <guillaume@eulerian.com>2016-01-26 00:28:27 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-19 14:22:39 -0800
commitfc345885783318c63a9860d4476e8cc4257de230 (patch)
tree6942633343d6e8fd85d1a25917d1806e535e8edc
parent863475041a73939c8c4b637711e4fe87b0464abd (diff)
downloadlwn-fc345885783318c63a9860d4476e8cc4257de230.tar.gz
lwn-fc345885783318c63a9860d4476e8cc4257de230.zip
ALSA: usb-audio: Fix TEAC UD-501/UD-503/NT-503 usb delay
commit 5a4ff9ec8d6edd2ab1cfe8ce6a080d6e57cbea9a upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/usb/quirks.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 94cd28c2bd8d..44550a4cf893 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -900,8 +900,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,
@@ -916,6 +920,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
*/