drop queue-5.4/alsa-usb-audio-add-mixer-mapping-for-corsair-hs80.patch

diff --git a/queue-5.4/alsa-usb-audio-add-mixer-mapping-for-corsair-hs80.patch b/queue-5.4/alsa-usb-audio-add-mixer-mapping-for-corsair-hs80.patch
deleted file mode 100644 (file)
index e172443..0000000
--- a/queue-5.4/alsa-usb-audio-add-mixer-mapping-for-corsair-hs80.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a7de2b873f3dbcda02d504536f1ec6dc50e3f6c4 Mon Sep 17 00:00:00 2001
-From: Marie Ramlow <me@nycode.dev>
-Date: Sat, 30 Nov 2024 17:52:40 +0100
-Subject: ALSA: usb-audio: add mixer mapping for Corsair HS80
-
-From: Marie Ramlow <me@nycode.dev>
-
-commit a7de2b873f3dbcda02d504536f1ec6dc50e3f6c4 upstream.
-
-The Corsair HS80 RGB Wireless is a USB headset with a mic and a sidetone
-feature. It has the same quirk as the Virtuoso series.
-This labels the mixers appropriately, so applications don't
-move the sidetone volume when they actually intend to move the main
-headset volume.
-
-Signed-off-by: Marie Ramlow <me@nycode.dev>
-cc: <stable@vger.kernel.org>
-Link: https://patch.msgid.link/20241130165240.17838-1-me@nycode.dev
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/usb/mixer_maps.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/sound/usb/mixer_maps.c
-+++ b/sound/usb/mixer_maps.c
-@@ -528,6 +528,16 @@ static const struct usbmix_ctl_map usbmi
-               .id = USB_ID(0x05a7, 0x1020),
-               .map = bose_companion5_map,
-       },
-+      {
-+              /* Corsair HS80 RGB Wireless (wired mode) */
-+              .id = USB_ID(0x1b1c, 0x0a6a),
-+              .map = corsair_virtuoso_map,
-+      },
-+      {
-+              /* Corsair HS80 RGB Wireless (wireless mode) */
-+              .id = USB_ID(0x1b1c, 0x0a6b),
-+              .map = corsair_virtuoso_map,
-+      },
-       {       /* Gigabyte TRX40 Aorus Master (rear panel + front mic) */
-               .id = USB_ID(0x0414, 0xa001),
-               .map = aorus_master_alc1220vb_map,

diff --git a/queue-5.4/series b/queue-5.4/series
index 49e47c3fba2f49df401db6628211a523513c9576..e272fb7a90de5f70d9805d03ae564d9d69675502 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -254,7 +254,6 @@ bpf-handle-bpf_exist-and-bpf_noexist-for-lpm-trie.patch
 bpf-fix-exact-match-conditions-in-trie_get_next_key.patch
 hid-wacom-fix-when-get-product-name-maybe-null-pointer.patch
 tracing-fix-cmp_entries_dup-to-respect-sort-comparison-rules.patch
-alsa-usb-audio-add-mixer-mapping-for-corsair-hs80.patch
 scsi-qla2xxx-fix-nvme-and-npiv-connect-issue.patch
 scsi-qla2xxx-supported-speed-displayed-incorrectly-for-vports.patch
 scsi-qla2xxx-remove-check-req_sg_cnt-should-be-equal-to-rsp_sg_cnt.patch