From patchwork Thu Oct 7 08:09:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Henningsson X-Patchwork-Id: 67006 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 3A8F2B70DA for ; Thu, 7 Oct 2010 19:09:58 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P3lXu-0000T1-D5; Thu, 07 Oct 2010 09:09:46 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P3lXs-0000Sl-87 for kernel-team@lists.ubuntu.com; Thu, 07 Oct 2010 09:09:44 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1P3lXs-000183-4B for ; Thu, 07 Oct 2010 09:09:44 +0100 Received: from c-83-233-18-148.cust.bredband2.com ([83.233.18.148] helo=[192.168.8.102]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P3lXs-0000x0-19 for kernel-team@lists.ubuntu.com; Thu, 07 Oct 2010 09:09:44 +0100 Message-ID: <4CAD8048.2050606@canonical.com> Date: Thu, 07 Oct 2010 10:09:44 +0200 From: David Henningsson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100922 Thunderbird/3.1.4 MIME-Version: 1.0 To: "kernel-team@lists.ubuntu.com" Subject: [Maverick][Pull request] (upstream) ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: https://launchpad.net/bugs/655386 BugLink: https://launchpad.net/bugs/546769 BugLink: https://launchpad.net/bugs/648871 BugLink: https://launchpad.net/bugs/642892 BugLink: https://launchpad.net/bugs/637291 BugLink: https://launchpad.net/bugs/637291 BugLink: https://launchpad.net/bugs/598938 ...they are very likely to be helped by the following commit, can we cherry-pick it? It should apply cleanly to Maverick. A Lucid version will follow shortly. commit abdd8f510686da0a58e475bc0143d1069e5f53da Author: Takashi Iwai Date: Tue Sep 21 17:38:14 2010 +0200 ALSA: hda - Apply ALC269 VAIO fix-up to all Sony laptops with ALC269 We've applied a fix-up for ALC269 VAIO only for two models. But all Sony VAIO models with ALC269 codec seem to require the similar fix. Let's apply it with vendor-id mask. Signed-off-by: Takashi Iwai }; Acked-by: Leann Ogasawara Acked-by: Tim Gardner diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f2a3044..eea88b7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -14731,8 +14731,7 @@ static const struct alc_fixup alc269_fixups[] = { }; static struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), - SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), + SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), {}