From owner-svn-src-all@FreeBSD.ORG  Wed Jan 25 09:57:34 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5636106566B;
	Wed, 25 Jan 2012 09:57:34 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FD508FC08;
	Wed, 25 Jan 2012 09:57:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0P9vYhU017259;
	Wed, 25 Jan 2012 09:57:34 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0P9vYq2017256;
	Wed, 25 Jan 2012 09:57:34 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201201250957.q0P9vYq2017256@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 25 Jan 2012 09:57:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230532 - head/sys/dev/sound/pci/hda
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2012 09:57:34 -0000

Author: mav
Date: Wed Jan 25 09:57:34 2012
New Revision: 230532
URL: http://svn.freebsd.org/changeset/base/230532

Log:
  Fix word order in hdaa_subvendor_id() to match PCI (where it comes from),
  broken at r230130. This should fix applying system-specific patches.

Modified:
  head/sys/dev/sound/pci/hda/hdaa.h
  head/sys/dev/sound/pci/hda/hdaa_patches.c

Modified: head/sys/dev/sound/pci/hda/hdaa.h
==============================================================================
--- head/sys/dev/sound/pci/hda/hdaa.h	Wed Jan 25 08:53:42 2012	(r230531)
+++ head/sys/dev/sound/pci/hda/hdaa.h	Wed Jan 25 09:57:34 2012	(r230532)
@@ -259,8 +259,8 @@ struct hdaa_chan {
 		hda_get_device_id(devinfo->dev))
 
 #define hdaa_subvendor_id(devinfo)					\
-		(((uint32_t)hda_get_subvendor_id(devinfo->dev) << 16) +	\
-		hda_get_subdevice_id(devinfo->dev))
+		(((uint32_t)hda_get_subdevice_id(devinfo->dev) << 16) +	\
+		hda_get_subvendor_id(devinfo->dev))
 
 struct hdaa_widget	*hdaa_widget_get(struct hdaa_devinfo *, nid_t);
 uint32_t		hdaa_widget_pin_patch(uint32_t config, const char *str);

Modified: head/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Jan 25 08:53:42 2012	(r230531)
+++ head/sys/dev/sound/pci/hda/hdaa_patches.c	Wed Jan 25 09:57:34 2012	(r230532)
@@ -620,9 +620,9 @@ hdaa_patch_direct(struct hdaa_devinfo *d
 		hda_command(dev, HDA_CMD_12BIT(0, devinfo->nid,
 		    0x7e7, 0));
 	if (id == HDA_CODEC_ALC269) {
-		if (subid == 0x104316e3 || subid == 0x1043831a ||
-		    subid == 0x1043834a || subid == 0x10438398 ||
-		    subid == 0x104383ce) {
+		if (subid == 0x16e31043 || subid == 0x831a1043 ||
+		    subid == 0x834a1043 || subid == 0x83981043 ||
+		    subid == 0x83ce1043) {
 			/*
 			 * The ditital mics on some Asus laptops produce
 			 * differential signals instead of expected stereo.