From: Greg Kroah-Hartman Date: Sat, 8 May 2021 11:50:47 +0000 (+0200) Subject: drop 4.4 alsa patch that had build warnings X-Git-Tag: v5.4.118~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b38d4aa00833fd4f0de86533c6d466a663a94d51;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 alsa patch that had build warnings --- diff --git a/queue-4.4/alsa-usb-audio-add-db-range-mapping-for-sennheiser-communications-headset-pc-8.patch b/queue-4.4/alsa-usb-audio-add-db-range-mapping-for-sennheiser-communications-headset-pc-8.patch deleted file mode 100644 index b31ae8ccd58..00000000000 --- a/queue-4.4/alsa-usb-audio-add-db-range-mapping-for-sennheiser-communications-headset-pc-8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ab2165e2e6ed17345ffa8ee88ca764e8788ebcd7 Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Mon, 3 May 2021 13:08:22 +0200 -Subject: ALSA: usb-audio: Add dB range mapping for Sennheiser Communications Headset PC 8 - -From: Timo Gurr - -commit ab2165e2e6ed17345ffa8ee88ca764e8788ebcd7 upstream. - -The decibel volume range contains a negative maximum value resulting in -pipewire complaining about the device and effectivly having no sound -output. The wrong values also resulted in the headset sounding muted -already at a mixer level of about ~25%. - -PipeWire BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1049 - -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=212897 -Signed-off-by: Timo Gurr -Cc: -Link: https://lore.kernel.org/r/20210503110822.10222-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/usb/mixer_maps.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/sound/usb/mixer_maps.c -+++ b/sound/usb/mixer_maps.c -@@ -348,6 +348,13 @@ static struct usbmix_name_map bose_compa - { 0 } /* terminator */ - }; - -+/* Sennheiser Communications Headset [PC 8], the dB value is reported as -6 negative maximum */ -+static const struct usbmix_dB_map sennheiser_pc8_dB = {-9500, 0}; -+static const struct usbmix_name_map sennheiser_pc8_map[] = { -+ { 9, NULL, .dB = &sennheiser_pc8_dB }, -+ { 0 } /* terminator */ -+}; -+ - /* - * Dell usb dock with ALC4020 codec had a firmware problem where it got - * screwed up when zero volume is passed; just skip it as a workaround -@@ -508,6 +515,11 @@ static struct usbmix_ctl_map usbmix_ctl_ - .id = USB_ID(0x0db0, 0x543d), - .map = asus_rog_map, - }, -+ { -+ /* Sennheiser Communications Headset [PC 8] */ -+ .id = USB_ID(0x1395, 0x0025), -+ .map = sennheiser_pc8_map, -+ }, - { 0 } /* terminator */ - }; - diff --git a/queue-4.4/series b/queue-4.4/series index 6c638752303..5d63351a207 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -38,4 +38,3 @@ scsi-lpfc-fix-crash-when-a-reg_rpi-mailbox-fails-tri.patch scsi-libfc-fix-a-format-specifier.patch alsa-emu8000-fix-a-use-after-free-in-snd_emu8000_create_mixer.patch alsa-sb-fix-two-use-after-free-in-snd_sb_qsound_build.patch -alsa-usb-audio-add-db-range-mapping-for-sennheiser-communications-headset-pc-8.patch