diff options
| author | Frank C Guenther <bugzilla.frnkcg@spamgourmet.com> | 2015-02-17 16:13:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-17 16:14:18 -0500 |
| commit | 3cd1ce0420ce89937bef9096d5bdb13fbdf0f8b0 (patch) | |
| tree | e01fcb130648a829209023d2a0e73f8ee8814490 | |
| parent | 9fd37810daa56b8c0a8d51565216c95220889e62 (diff) | |
ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)
Fix problem where playback of Denon DA-300USB DAC sometimes does not
start and leads to error messages like "clock source 41 is not valid,
cannot use".
Solution: Treat this device the same as other Denon/Marantz devices in
sound/usb/quirks.c.
Tested with both PCM and DSD formats.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93261
Signed-off-by: Frank C Guenther <bugzilla.frnkcg@spamgourmet.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/usb/quirks.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 5c0c05314df0..753a47de8459 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -1127,6 +1127,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, | |||
| 1127 | int err; | 1127 | int err; |
| 1128 | 1128 | ||
| 1129 | switch (subs->stream->chip->usb_id) { | 1129 | switch (subs->stream->chip->usb_id) { |
| 1130 | case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */ | ||
| 1130 | case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ | 1131 | case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ |
| 1131 | case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ | 1132 | case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ |
| 1132 | 1133 | ||
| @@ -1206,6 +1207,7 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, | |||
| 1206 | (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) { | 1207 | (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) { |
| 1207 | 1208 | ||
| 1208 | switch (le16_to_cpu(dev->descriptor.idProduct)) { | 1209 | switch (le16_to_cpu(dev->descriptor.idProduct)) { |
| 1210 | case 0x1003: /* Denon DA300-USB */ | ||
| 1209 | case 0x3005: /* Marantz HD-DAC1 */ | 1211 | case 0x3005: /* Marantz HD-DAC1 */ |
| 1210 | case 0x3006: /* Marantz SA-14S1 */ | 1212 | case 0x3006: /* Marantz SA-14S1 */ |
| 1211 | mdelay(20); | 1213 | mdelay(20); |
| @@ -1267,6 +1269,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, | |||
| 1267 | 1269 | ||
| 1268 | /* Denon/Marantz devices with USB DAC functionality */ | 1270 | /* Denon/Marantz devices with USB DAC functionality */ |
| 1269 | switch (chip->usb_id) { | 1271 | switch (chip->usb_id) { |
| 1272 | case USB_ID(0x154e, 0x1003): /* Denon DA300-USB */ | ||
| 1270 | case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ | 1273 | case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ |
| 1271 | case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ | 1274 | case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ |
| 1272 | if (fp->altsetting == 2) | 1275 | if (fp->altsetting == 2) |
