From owner-svn-src-all@FreeBSD.ORG  Wed Apr  4 17:27:13 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 97C0F1065675;
	Wed,  4 Apr 2012 17:27:13 +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 826938FC18;
	Wed,  4 Apr 2012 17:27:13 +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 q34HRDFt016314;
	Wed, 4 Apr 2012 17:27:13 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q34HRD6C016312;
	Wed, 4 Apr 2012 17:27:13 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201204041727.q34HRD6C016312@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 4 Apr 2012 17:27:13 +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: r233879 - 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: Wed, 04 Apr 2012 17:27:13 -0000

Author: mav
Date: Wed Apr  4 17:27:13 2012
New Revision: 233879
URL: http://svn.freebsd.org/changeset/base/233879

Log:
  MFC r233692:
  Reenable unsolicited responses on CODEC if hdaa_sense_init() called again.
  This fixes jack connection events handling after suspend/resume.
  
  PR:		kern/166382

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

Modified: stable/9/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/9/sys/dev/sound/pci/hda/hdaa.c	Wed Apr  4 17:24:53 2012	(r233878)
+++ stable/9/sys/dev/sound/pci/hda/hdaa.c	Wed Apr  4 17:27:13 2012	(r233879)
@@ -612,10 +612,11 @@ hdaa_sense_init(struct hdaa_devinfo *dev
 		if (w == NULL || w->enable == 0 || w->type !=
 		    HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX)
 			continue;
-		if (HDA_PARAM_AUDIO_WIDGET_CAP_UNSOL_CAP(w->param.widget_cap) &&
-		    w->unsol < 0) {
-			w->unsol = HDAC_UNSOL_ALLOC(
-			    device_get_parent(devinfo->dev), devinfo->dev, w->nid);
+		if (HDA_PARAM_AUDIO_WIDGET_CAP_UNSOL_CAP(w->param.widget_cap)) {
+			if (w->unsol < 0)
+				w->unsol = HDAC_UNSOL_ALLOC(
+				    device_get_parent(devinfo->dev),
+				    devinfo->dev, w->nid);
 			hda_command(devinfo->dev,
 			    HDA_CMD_SET_UNSOLICITED_RESPONSE(0, w->nid,
 			    HDA_CMD_SET_UNSOLICITED_RESPONSE_ENABLE | w->unsol));