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.

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;