diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
commit | 8654844cf51d434dad5d4d9f48dc99d1ac89aad7 (patch) | |
tree | ce1ad2eb865c6f5e15b4f7f119e05e439d675a53 /sound/usb/quirks.c | |
parent | 01ec65c812ef829c815d2f37a97cc4eb7925f8ae (diff) | |
parent | 132bd96bc56f9cafd24b71de389984d0e83a0956 (diff) | |
download | linux-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.tar.bz2 |
Merge branch 'for-linus' into for-next
Resolve the non-trivial conflict due to the hdac regmap API changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/quirks.c')
-rw-r--r-- | sound/usb/quirks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 29175346cc4f..754e689596a2 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1120,6 +1120,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) 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 */ + case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ return true; } return false; @@ -1266,8 +1267,9 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, if (fp->altsetting == 2) return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; - /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */ - case USB_ID(0x20b1, 0x2009): + + case USB_ID(0x20b1, 0x2009): /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */ + case USB_ID(0x20b1, 0x2023): /* JLsounds I2SoverUSB */ if (fp->altsetting == 3) return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; |