From patchwork Mon May 26 08:22:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 4240451 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B25EA9F1E7 for ; Mon, 26 May 2014 08:24:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03F0D201D3 for ; Mon, 26 May 2014 08:24:45 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D9558201CE for ; Mon, 26 May 2014 08:24:43 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D742D2651CF; Mon, 26 May 2014 10:24:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id BB75C26506E; Mon, 26 May 2014 10:23:29 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8B5F6265012; Mon, 26 May 2014 10:23:28 +0200 (CEST) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by alsa0.perex.cz (Postfix) with ESMTP id DF1F726170F for ; Mon, 26 May 2014 10:23:20 +0200 (CEST) Received: by mail-pa0-f45.google.com with SMTP id ey11so7284363pad.32 for ; Mon, 26 May 2014 01:23:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IP8x2E+yKaXuN8rB80ARLUb7K0Zw6r7KW/7naWW6RTc=; b=U3XEoYR1dCKzXCSTddJAo3nn+zqzcWprCGLGssXvoR+p8aEgpIxlsl5+2o4qC6C9gs AaapA3lHhrPO6bxlTWjgX1NeVlSLV8uXDOYyfSqUL78c9ZPHyiKPEttXHDGwLnsd0EW3 ZeNpzZuwwPgamQ7U3teDch9pkHLIWQkG407lHj4ztoXxHgnVBvoFCXXLj6oe+w1uk0Y0 FlITpuBV3ZJLvnNEqv136ty/sUNkED9Agsvp83HIGkudLvrdXK4OFfzX0zc78VsU9oWg /5ILUu3W8CqC2tGkzBFvN/MlOnhsrhjmP2A3r9/VQXRsUtTvjOJd/AgD+XucVYkMXo5C 6VNw== X-Gm-Message-State: ALoCoQkmSnTz7Bjt/jFNuAEo6zmjan4rXenMY6i9OSR5qR+PU8gGNBG7HUVTCnw9PpvMEV4ihXeY X-Received: by 10.68.130.6 with SMTP id oa6mr25773086pbb.102.1401092599727; Mon, 26 May 2014 01:23:19 -0700 (PDT) Received: from localhost.localdomain ([116.213.97.190]) by mx.google.com with ESMTPSA id ov4sm16964840pbc.46.2014.05.26.01.23.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 26 May 2014 01:23:18 -0700 (PDT) From: Hui Wang To: tiwai@suse.de, alsa-devel@alsa-project.org Date: Mon, 26 May 2014 16:22:42 +0800 Message-Id: <1401092564-14293-3-git-send-email-hui.wang@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1401092564-14293-1-git-send-email-hui.wang@canonical.com> References: <1401092564-14293-1-git-send-email-hui.wang@canonical.com> Cc: hui.wang@canonical.com, david.henningsson@canonical.com Subject: [alsa-devel] [PATCH 3/5] ALSA: hda - get subvendor from codec rather than pci_dev X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP It is safer for non-pci situation. Signed-off-by: Hui Wang --- sound/pci/hda/hda_auto_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index a142753..b684c6e 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -860,7 +860,7 @@ void snd_hda_pick_pin_fixup(struct hda_codec *codec, return; for (pq = pin_quirk; pq->subvendor; pq++) { - if (codec->bus->pci->subsystem_vendor != pq->subvendor) + if ((codec->subsystem_id & 0xffff0000) != (pq->subvendor << 16)) continue; if (codec->vendor_id != pq->codec) continue;