diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 17:24:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-15 15:17:09 -0400 |
| commit | ea8a1660b1153e794b4a9da90e7476225de3e23f (patch) | |
| tree | 8da823ae7557b6fccb9c74ec958b33cfd4764787 | |
| parent | 2d890825a01fd1460916f4686eeeb8c49bb81f1e (diff) | |
| download | longterm-queue-4.18-ea8a1660b1153e794b4a9da90e7476225de3e23f.tar.gz | |
alsa: drop revert of never-applied commit
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch | 58 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 59 deletions
diff --git a/queue/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch b/queue/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch deleted file mode 100644 index 27c9391..0000000 --- a/queue/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 Mon Sep 17 00:00:00 2001 -From: Hui Wang <hui.wang@canonical.com> -Date: Fri, 14 Jun 2019 16:44:12 +0800 -Subject: [PATCH] Revert "ALSA: hda/realtek - Improve the headset mic for Acer - Aspire laptops" - -commit 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 upstream. - -This reverts commit 9cb40eb184c4220d244a532bd940c6345ad9dbd9. - -This patch introduces noise and headphone playback issue after -rebooting or suspending/resuming. Let us revert it. - -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=203831 -Fixes: 9cb40eb184c4 ("ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops") -Cc: <stable@vger.kernel.org> -Signed-off-by: Hui Wang <hui.wang@canonical.com> -Signed-off-by: Takashi Iwai <tiwai@suse.de> - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 1afb268f3da0..179e4be1f747 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -6268,15 +6268,13 @@ static const struct hda_fixup alc269_fixups[] = { - .chain_id = ALC269_FIXUP_THINKPAD_ACPI, - }, - [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = { -- .type = HDA_FIXUP_VERBS, -- .v.verbs = (const struct hda_verb[]) { -- /* Enable the Mic */ -- { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 }, -- { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 }, -- {} -+ .type = HDA_FIXUP_PINS, -+ .v.pins = (const struct hda_pintbl[]) { -+ { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */ -+ { } - }, - .chained = true, -- .chain_id = ALC269_FIXUP_LIFEBOOK_EXTMIC -+ .chain_id = ALC255_FIXUP_HEADSET_MODE - }, - [ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = { - .type = HDA_FIXUP_PINS, -@@ -7321,10 +7319,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { - {0x19, 0x0181303F}, - {0x21, 0x0221102f}), - SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE, -- {0x12, 0x90a60140}, -- {0x14, 0x90170120}, -- {0x21, 0x02211030}), -- SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE, - {0x12, 0x90a601c0}, - {0x14, 0x90171120}, - {0x21, 0x02211030}), --- -2.7.4 - diff --git a/queue/series b/queue/series index d53a1fb..8b938f8 100644 --- a/queue/series +++ b/queue/series @@ -112,7 +112,6 @@ HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch -Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch |