Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / sound / usb / quirks.c

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index eb4b9f7a571e0f154fd7e00b81ef2c5ff7a17130..01eff6ce6401a3f8c6c8b51da93524f635bba86a 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1360,6 +1360,21 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
                if (fp->altsetting == 3)
                        return SNDRV_PCM_FMTBIT_DSD_U32_BE;
                break;
+
+       /* Amanero Combo384 USB interface with native DSD support */
+       case USB_ID(0x16d0, 0x071a):
+               if (fp->altsetting == 2) {
+                       switch (chip->dev->descriptor.bcdDevice) {
+                       case 0x199:
+                               return SNDRV_PCM_FMTBIT_DSD_U32_LE;
+                       case 0x19b:
+                               return SNDRV_PCM_FMTBIT_DSD_U32_BE;
+                       default:
+                               break;
+                       }
+               }
+               break;
+
        default:
                break;
        }