From patchwork Tue Aug 24 09:25:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Henningsson X-Patchwork-Id: 62560 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 EB14EB70D1 for ; Tue, 24 Aug 2010 19:25:42 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OnplA-0005Uc-D5; Tue, 24 Aug 2010 10:25:36 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Onpl7-0005TK-28 for kernel-team@lists.ubuntu.com; Tue, 24 Aug 2010 10:25:33 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Onpl6-0005ix-N0 for ; Tue, 24 Aug 2010 10:25:32 +0100 Received: from [88.83.60.91] (helo=[192.168.8.103]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Onpl6-0006tn-IV for kernel-team@lists.ubuntu.com; Tue, 24 Aug 2010 10:25:32 +0100 Message-ID: <4C73900B.9040006@canonical.com> Date: Tue, 24 Aug 2010 11:25:31 +0200 From: David Henningsson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: Re: Maverick Beta Approaching References: <1282609304.3656.688.camel@emiko> <1282613720.3656.754.camel@emiko> In-Reply-To: <1282613720.3656.754.camel@emiko> 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 2010-08-24 03:35, Leann Ogasawara skrev: > On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote: >> Any >> kernel patches which you want to see included in the Maverick Beta >> kernel need to be submitted to this mailing list and obtain the >> necessary Ack's *before* this Fri Aug 27. I'm still new, and still looking for a checklist of what/how to do with my patches, what to put here and there to satisfy both upstream and Ubuntu. So far I've been sending them upstream only. Mind adding the attached ones for Maverick Beta? Some of them might already be there. Or do you prefer git SHA's? From ae4e9f41cf404d879b14be56591c4d5c6b403b71 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Wed, 2 Jun 2010 16:56:41 +0200 Subject: [PATCH] Ensure codec patch files are checked for the correct codec ID Signed-off-by: David Henningsson --- sound/pci/hda/hda_hwdep.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index a1fc837..0e2cb27 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c @@ -649,7 +649,9 @@ static void parse_codec_mode(char *buf, struct hda_bus *bus, *codecp = NULL; if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) { list_for_each_entry(codec, &bus->codec_list, list) { - if (codec->addr == caddr) { + if (codec->vendor_id == vendorid && + codec->subsystem_id == subid && + codec->addr == caddr) { *codecp = codec; break; } -- 1.7.0.4