diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-03-02 10:17:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-03-02 10:17:50 +0100 |
| commit | 927a4c7b7ec14fbb0cd3d7ce1071b96fb5588982 (patch) | |
| tree | 8cbfea64afbfb92cbf8eea519f7854ff8ad9cd83 /sound/usb | |
| parent | eb596e0fd13c83b4a66559a45b57b71aac340d30 (diff) | |
| parent | 2c9119001dcb1dc7027257c5d8960d30f5ba58be (diff) | |
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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer_maps.c | 10 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index a7212f16660e..646deb6244b1 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -537,6 +537,16 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .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), .map = corsair_virtuoso_map, diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 9ba4682ebc48..737b2729c0d3 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -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; } |