summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-03-04 07:41:41 (GMT)
committerTakashi Iwai <tiwai@suse.de>2016-03-04 07:41:41 (GMT)
commit6defb60ae4ffe92c29291ed49695daa255b8f559 (patch)
tree67506a05d171df966b8ca9efa261fa307025e91e /sound/usb
parent03367bf7fd30165bda3b037b3078cfa231ba33b7 (diff)
parent790b415c98de62602810b0eedce26f0f9d6ddd78 (diff)
downloadlinux-6defb60ae4ffe92c29291ed49695daa255b8f559.tar.xz
Merge branch 'for-linus' into for-next
Resolved the conflicts with the latest HDA HDMI fixes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/quirks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 2585c17..5b03296 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1123,6 +1123,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */
case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */
case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
+ case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */