From owner-svn-src-all@FreeBSD.ORG  Thu Jul  5 15:32:31 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 973B01065675;
	Thu,  5 Jul 2012 15:32:31 +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 8160C8FC0A;
	Thu,  5 Jul 2012 15:32:31 +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 q65FWVWs081074;
	Thu, 5 Jul 2012 15:32:31 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q65FWVos081072;
	Thu, 5 Jul 2012 15:32:31 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201207051532.q65FWVos081072@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 5 Jul 2012 15:32:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238131 - stable/9/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: Thu, 05 Jul 2012 15:32:31 -0000

Author: mav
Date: Thu Jul  5 15:32:31 2012
New Revision: 238131
URL: http://svn.freebsd.org/changeset/base/238131

Log:
  MFC r238011:
  Restore GPIO config quirks handling, lost during last big refactoring.
  This fixes sound from speakers on some laptops, including MacBook Pro.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/sound/pci/hda/hdaa_patches.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/sound/pci/hda/hdaa_patches.c
==============================================================================
--- stable/9/sys/dev/sound/pci/hda/hdaa_patches.c	Thu Jul  5 15:23:45 2012	(r238130)
+++ stable/9/sys/dev/sound/pci/hda/hdaa_patches.c	Thu Jul  5 15:32:31 2012	(r238131)
@@ -401,12 +401,9 @@ hdaa_patch(struct hdaa_devinfo *devinfo)
 		if (!(HDA_DEV_MATCH(hdac_quirks[i].model, subid) &&
 		    HDA_DEV_MATCH(hdac_quirks[i].id, id)))
 			continue;
-		if (hdac_quirks[i].set != 0)
-			devinfo->quirks |=
-			    hdac_quirks[i].set;
-		if (hdac_quirks[i].unset != 0)
-			devinfo->quirks &=
-			    ~(hdac_quirks[i].unset);
+		devinfo->quirks |= hdac_quirks[i].set;
+		devinfo->quirks &= ~(hdac_quirks[i].unset);
+		devinfo->gpio = hdac_quirks[i].gpio;
 	}
 
 	/* Apply per-widget patch. */