summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-28 18:30:19 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-28 18:30:19 +0100
commit50314663877b3c5f08b2573c0bb161b6a2c63c3e (patch)
treeeda596ffce10fae670168e2d7aa797f5a1b0a2a7 /sound/usb
parent6874daad4b0fbed5b2f9bef7f4d3f2b895463a95 (diff)
parentd42472ecffd7c42086c6e5b1335c99a3adf58a09 (diff)
downloadlinux-50314663877b3c5f08b2573c0bb161b6a2c63c3e.tar.bz2
Merge branch 'for-linus' into for-next
The commit [7a2e9ddc: ALSA: usb-audio: Add native DSD support for Denon/Marantz DACs] requires the new format definition that has landed only in for-next branch.
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/quirks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index e0cde741e41d..e45cc3af9b9c 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1240,12 +1240,12 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
/* iFi Audio micro/nano iDSD */
case USB_ID(0x20b1, 0x3008):
if (fp->altsetting == 2)
- return SNDRV_PCM_FMTBIT_DSD_U32_LE;
+ return SNDRV_PCM_FMTBIT_DSD_U32_BE;
break;
/* DIYINHK DSD DXD 384kHz USB to I2S/DSD */
case USB_ID(0x20b1, 0x2009):
if (fp->altsetting == 3)
- return SNDRV_PCM_FMTBIT_DSD_U32_LE;
+ return SNDRV_PCM_FMTBIT_DSD_U32_BE;
break;
default:
break;