summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-29 10:27:50 +0200
committerTakashi Iwai <tiwai@suse.de>2015-05-29 10:27:50 +0200
commit984a8547052711867332eeaec4141755fc040553 (patch)
treec8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /sound/usb
parent3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff)
parentb47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff)
downloadlinux-984a8547052711867332eeaec4141755fc040553.tar.bz2
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/quirks.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 7c5a70139278..29175346cc4f 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1117,6 +1117,8 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
switch (chip->usb_id) {
case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema */
case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
+ case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */
+ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
return true;
}