diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-08 05:29:56 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-08 05:30:49 -0400 |
| commit | 0a599838737a2527c35e4d94f794aefe59df1781 (patch) | |
| tree | b1f7571949527c459ca5e27bd420518e905c8b27 /sound/usb | |
| parent | 2d846c74027231264e57e4e34faf9576394e3ce0 (diff) | |
| parent | a59d7199f62b8336570972dcc288321d0ec999fe (diff) | |
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.c | 9 |
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, | |||
| 1113 | 1113 | ||
| 1114 | bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) | 1114 | bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) |
| 1115 | { | 1115 | { |
| 1116 | /* MS Lifecam HD-5000 doesn't support reading the sample rate. */ | 1116 | /* devices which do not support reading the sample rate. */ |
| 1117 | return chip->usb_id == USB_ID(0x045E, 0x076D); | 1117 | switch (chip->usb_id) { |
| 1118 | case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ | ||
| 1119 | case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ | ||
| 1120 | return true; | ||
| 1121 | } | ||
| 1122 | return false; | ||
| 1118 | } | 1123 | } |
| 1119 | 1124 | ||
| 1120 | /* Marantz/Denon USB DACs need a vendor cmd to switch | 1125 | /* Marantz/Denon USB DACs need a vendor cmd to switch |