From owner-svn-src-stable-8@FreeBSD.ORG Thu Sep 27 08:06:03 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id DA6471065678;
Thu, 27 Sep 2012 08:06:03 +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 C5BC78FC17;
Thu, 27 Sep 2012 08:06:03 +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 q8R863RL079557;
Thu, 27 Sep 2012 08:06:03 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R863TO079555;
Thu, 27 Sep 2012 08:06:03 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201209270806.q8R863TO079555@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 27 Sep 2012 08:06:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r240987 - stable/8/sys/dev/sound/pci/hda
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>,
<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>,
<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 08:06:04 -0000
Author: mav
Date: Thu Sep 27 08:06:03 2012
New Revision: 240987
URL: http://svn.freebsd.org/changeset/base/240987
Log:
MFC r240884:
Fix panic caused by wrong pointer dereference, left after pin sense rewrite
at r230551.
Also while there, make sense polling use reported for each node separately
instead of reporting accumulated total status.
Modified:
stable/8/sys/dev/sound/pci/hda/hdaa.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/pci/ (props changed)
Modified: stable/8/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 08:04:59 2012 (r240986)
+++ stable/8/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 08:06:03 2012 (r240987)
@@ -627,7 +627,7 @@ hdaa_sense_init(struct hdaa_devinfo *dev
(HDA_CONFIG_DEFAULTCONF_MISC(w->wclass.pin.config) & 1) != 0) {
device_printf(devinfo->dev,
"No presence detection support at nid %d\n",
- as[i].pins[15]);
+ w->nid);
} else {
if (w->unsol < 0)
poll = 1;
@@ -636,7 +636,7 @@ hdaa_sense_init(struct hdaa_devinfo *dev
"Headphones redirection for "
"association %d nid=%d using %s.\n",
w->bindas, w->nid,
- (poll != 0) ? "polling" :
+ (w->unsol < 0) ? "polling" :
"unsolicited responses");
);
};