diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-01-29 11:07:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-01-29 11:07:48 +0100 |
| commit | 286406c2e198b199c348447b3a7c54c6324db147 (patch) | |
| tree | a193b6e6590e268ba46fe876146c3545d03599c0 /sound/usb | |
| parent | b2e9e1c8810ee05c95f4d55800b8afae70ab01b4 (diff) | |
| parent | e190161f96b88ffae870405fd6c3fdd1d2e7f98d (diff) | |
Merge branch 'for-linus' into for-next
Pull 5.0 branch for further development of USB-audio quirks
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 96340f23f86d..bb8372833fc2 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -768,7 +768,7 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) * REG1: PLL binary search enable, soft mute enable. */ CM6206_REG1_PLLBIN_EN | - CM6206_REG1_SOFT_MUTE_EN | + CM6206_REG1_SOFT_MUTE_EN, /* * REG2: enable output drivers, * select front channels to the headphone output, @@ -1492,6 +1492,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + case USB_ID(0x10cb, 0x0103): /* The Bit Opus #3; with fp->dsd_raw */ case USB_ID(0x152a, 0x85de): /* SMSL D1 DAC */ case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */ case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */ |