svn commit: r238131 - stable/9/sys/dev/sound/pci/hda

[Alexander Motin]

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. */