Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2517557pxj; Mon, 10 May 2021 05:02:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydn/lkI4yypw5Ju5vSM8uNq6l5QSbWrp66uJXCOuTqY9Ox8qLKL6r7F91Q3rhyHjat+KPH X-Received: by 2002:a05:6e02:154d:: with SMTP id j13mr19998880ilu.46.1620648178386; Mon, 10 May 2021 05:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620648178; cv=none; d=google.com; s=arc-20160816; b=xQIrWGQGb6aZbezhiHGyYytJURfqYY1+/Zjf5ARuJwzOZx43rPjflHn0yp1LSHkEIQ OtIVfGpf0FN+TmdhjzcaLsMjaFboN/1rNTVZSsfJzPkbN+nymQaPmV4SJ4fvdO5sPJkB tD4q3BzND29qi/Dtae5IwUPtbZfQUlxTwwMn76PIdrKVDh5Wx/rJ23kWLLHtduNamqim r5Q7e+GjeWErF6YVYI+hLGkFoN9Iu0M71AAk8i0gOOADESkxAEjpBkxQhf4lDPwruyyl E6VCuvSK4c79PKUnN1Tsj6lvc+MWGKofzUSEWIkk3WhbQSO0aj04mScFgTw0GREvIoDN sqJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=u0PObSgyL9eV5qSXvChB286cAe3sPcwOcO+JymMP/ZU=; b=oPcKuxIptGLDn+n5tfIS9ETR9yeEWMXqQ9h/pQC2799vVCg2rDhqwiW4RDgaMQe5d0 3amYp76OL4DPMjMEyjvcGLc0RfLAwquftLJBtcruUwsVmIbVneR3srvvahmrBQHxPVKH yw/7bjdru2LYfl/wHBdznR5/a6JU0WNh665PpN706gMPkqC7OOR5jTS4xkSURiaTdIMZ fg1AswgwRs+X+iEF3xR8AIacFA6xNzmLcvYAtYi7U/HhSy969fqSVk23MIf8OQAurRW1 xtVyusmSv+DiBUxNrUdEEpqX+qFS9/h4dbUY9kkiNJhTkIo9hBPvUM6FQKZAW+5s58mC hZgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=haZGVBd6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r2si14701897ioh.103.2021.05.10.05.02.42; Mon, 10 May 2021 05:02:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=haZGVBd6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237923AbhEJLyx (ORCPT + 99 others); Mon, 10 May 2021 07:54:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:36600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232147AbhEJLDw (ORCPT ); Mon, 10 May 2021 07:03:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 806BA6191C; Mon, 10 May 2021 10:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644073; bh=dRcBh40usbpUAMrJQwi6LYe34sL2xU+NSNEIES2cWn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=haZGVBd61gASpl0lFTqbOVdtqryg5Rs5tB55O53uH3pKgspfgG4kwWe1cOeN963c1 76mRNgj5ej3DHHbbftTIh7dxbZbmSazjKTjAhlkpG5zNOk1MM190DRPNeSTw4z7ytf J6NzBCuSua5eRMxdrv6Tl22QH0vUvvDPaPYwtwQs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sami Loone , Takashi Iwai Subject: [PATCH 5.11 249/342] ALSA: hda/realtek: fix static noise on ALC285 Lenovo laptops Date: Mon, 10 May 2021 12:20:39 +0200 Message-Id: <20210510102018.315475197@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sami Loone commit 9bbb94e57df135ef61bef075d9c99b8d9e89e246 upstream. Remove a duplicate vendor+subvendor pin fixup entry as one is masking the other and making it unreachable. Consider the more specific newcomer as a second chance instead. The generic entry is made less strict to also match for laptops with slightly different 0x12 pin configuration. Tested on Lenovo Yoga 6 (AMD) where 0x12 is 0x40000000. Fixes: 607184cb1635 ("ALSA: hda/realtek - Add supported for more Lenovo ALC285 Headset Button") Signed-off-by: Sami Loone Cc: Link: https://lore.kernel.org/r/YIXS+GT/dGI/LtK6@yoga Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8774,12 +8774,7 @@ static const struct snd_hda_pin_quirk al {0x12, 0x90a60130}, {0x19, 0x03a11020}, {0x21, 0x0321101f}), - SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK, - {0x14, 0x90170110}, - {0x19, 0x04a11040}, - {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE, - {0x12, 0x90a60130}, {0x14, 0x90170110}, {0x19, 0x04a11040}, {0x21, 0x04211020}), @@ -8950,6 +8945,10 @@ static const struct snd_hda_pin_quirk al SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, {0x19, 0x40000000}, {0x1a, 0x40000000}), + SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK, + {0x14, 0x90170110}, + {0x19, 0x04a11040}, + {0x21, 0x04211020}), {} };