diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /sound/usb/quirks.c | |
| parent | 0f32fd1900e6b972f289416dbd75e92772b630cb (diff) | |
| parent | 01cb156edbbd4e6c4fd8db0d05f18c62c424f9aa (diff) | |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 809d7fab4633..2c1018e447b1 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1155,6 +1155,20 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, if ((le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) mdelay(20); + + /* Marantz/Denon devices with USB DAC functionality need a delay + * after each class compliant request + */ + if ((le16_to_cpu(dev->descriptor.idVendor) == 0x154e) && + (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) { + + switch (le16_to_cpu(dev->descriptor.idProduct)) { + case 0x3005: /* Marantz HD-DAC1 */ + case 0x3006: /* Marantz SA-14S1 */ + mdelay(20); + break; + } + } } /* |