diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
| commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch) | |
| tree | 47da3feee8e263e8c9352c85cf518e624be3c211 /sound/usb/quirks.c | |
| parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 913552078285..b8cb57aeec77 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -1137,6 +1137,8 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) | |||
| 1137 | case USB_ID(0x047F, 0x02F7): /* Plantronics BT-600 */ | 1137 | case USB_ID(0x047F, 0x02F7): /* Plantronics BT-600 */ |
| 1138 | case USB_ID(0x047F, 0x0415): /* Plantronics BT-300 */ | 1138 | case USB_ID(0x047F, 0x0415): /* Plantronics BT-300 */ |
| 1139 | case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ | 1139 | case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ |
| 1140 | case USB_ID(0x047F, 0xC022): /* Plantronics C310 */ | ||
| 1141 | case USB_ID(0x047F, 0xC036): /* Plantronics C520-M */ | ||
| 1140 | case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ | 1142 | case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ |
| 1141 | case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */ | 1143 | case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */ |
| 1142 | case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */ | 1144 | case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */ |