Commit 927a4c7b authored Mar 02, 2021 by Takashi Iwai

Merge branch 'for-linus' into for-next



Back-merge of 5.12 devel branch for applying the further Pioneer DJM
patches.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parents eb596e0f 2c911900

sound/usb/mixer_maps.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -536,6 +536,16 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
		.id = USB_ID(0x05a7, 0x1020),
		.map = bose_companion5_map,
		},
		{
		/* Corsair Virtuoso SE (wired mode) */
		.id = USB_ID(0x1b1c, 0x0a3d),
		.map = corsair_virtuoso_map,
		},
		{
		/* Corsair Virtuoso SE (wireless mode) */
		.id = USB_ID(0x1b1c, 0x0a3e),
		.map = corsair_virtuoso_map,
		},
		{
		/* Corsair Virtuoso (wired mode) */
		.id = USB_ID(0x1b1c, 0x0a41),

sound/usb/quirks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1482,7 +1482,7 @@ static int pioneer_djm_set_format_quirk(struct snd_usb_substream *subs,
		usb_set_interface(subs->dev, 0, 1);
		// we should derive windex from fmt-sync_ep but it's not set
		snd_usb_ctl_msg(subs->stream->chip->dev,
		usb_rcvctrlpipe(subs->stream->chip->dev, 0),
		usb_sndctrlpipe(subs->stream->chip->dev, 0),
		0x01, 0x22, 0x0100, windex, &sr, 0x0003);
		return 0;
		}