diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-23 22:02:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-03-23 22:03:29 +0100 |
| commit | 3446b1e962b387b8cec53e85fdd9392da25a2737 (patch) | |
| tree | 909bc89c653b5677a457372e745ef322cb63ed20 /sound/usb | |
| parent | 21e9b3e931f78497b19b1f8f3d59d19412c1a28f (diff) | |
| parent | b00214865d65100163574ba250008f182cf90869 (diff) | |
| download | linux-3446b1e962b387b8cec53e85fdd9392da25a2737.tar.gz linux-3446b1e962b387b8cec53e85fdd9392da25a2737.tar.bz2 linux-3446b1e962b387b8cec53e85fdd9392da25a2737.zip | |
Merge branch 'for-linus' into for-next
Back-merge for applying more series of fixes for USB DSD support.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index eeea8e18aea3..6aa0ebd4a5a2 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1171,6 +1171,7 @@ static bool is_teac_dsd_dac(unsigned int id) switch (id) { case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */ case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */ + case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */ return true; } return false; |