summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-08 12:29:56 +0300
committerTakashi Iwai <tiwai@suse.de>2015-04-08 12:30:49 +0300
commit0a599838737a2527c35e4d94f794aefe59df1781 (patch)
treeb1f7571949527c459ca5e27bd420518e905c8b27 /sound/usb
parent2d846c74027231264e57e4e34faf9576394e3ce0 (diff)
parenta59d7199f62b8336570972dcc288321d0ec999fe (diff)
downloadlinux-0a599838737a2527c35e4d94f794aefe59df1781.tar.xz
Merge branch 'for-linus' into for-next
Back merge HD-audio quirks to for-next branch, so that we can apply a couple of more quirks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/quirks.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 353532b8aee4..8f63e8c8b46c 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1113,8 +1113,13 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
{
- /* MS Lifecam HD-5000 doesn't support reading the sample rate. */
- return chip->usb_id == USB_ID(0x045E, 0x076D);
+ /* devices which do not support reading the sample rate. */
+ switch (chip->usb_id) {
+ case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
+ case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
+ return true;
+ }
+ return false;
}
/* Marantz/Denon USB DACs need a vendor cmd to switch