From: Greg Kroah-Hartman Date: Wed, 1 Nov 2017 15:19:56 +0000 (+0100) Subject: drop alsa patch from 3.18 X-Git-Tag: v3.18.79~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2cbf896d7a5708ed28525998477869caba539b3;p=thirdparty%2Fkernel%2Fstable-queue.git drop alsa patch from 3.18 --- diff --git a/queue-3.18/alsa-hda-fix-headset-mic-problem-for-dell-machines-with-alc236.patch b/queue-3.18/alsa-hda-fix-headset-mic-problem-for-dell-machines-with-alc236.patch deleted file mode 100644 index 9f7f1e88018..00000000000 --- a/queue-3.18/alsa-hda-fix-headset-mic-problem-for-dell-machines-with-alc236.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f265788c336979090ac80b9ae173aa817c4fe40d Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Tue, 24 Oct 2017 16:53:34 +0800 -Subject: ALSA: hda - fix headset mic problem for Dell machines with alc236 - -From: Hui Wang - -commit f265788c336979090ac80b9ae173aa817c4fe40d upstream. - -We have several Dell laptops which use the codec alc236, the headset -mic can't work on these machines. Following the commit 736f20a70, we -add the pin cfg table to make the headset mic work. - -Signed-off-by: Hui Wang -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -5635,6 +5635,14 @@ static const struct snd_hda_pin_quirk al - ALC225_STANDARD_PINS, - {0x12, 0xb7a60130}, - {0x1b, 0x90170110}), -+ SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, -+ {0x12, 0x90a60140}, -+ {0x14, 0x90170110}, -+ {0x21, 0x02211020}), -+ SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, -+ {0x12, 0x90a60140}, -+ {0x14, 0x90170150}, -+ {0x21, 0x02211020}), - SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, - ALC255_STANDARD_PINS, - {0x12, 0x40300000}, diff --git a/queue-3.18/series b/queue-3.18/series index f9447edcd07..814347adaef 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -1,4 +1,3 @@ -alsa-hda-fix-headset-mic-problem-for-dell-machines-with-alc236.patch ceph-unlock-dangling-spinlock-in-try_flush_caps.patch usb-xhci-handle-error-condition-in-xhci_stop_device.patch spi-uapi-spidev-add-missing-ioctl-header.patch