Date: Thu, 27 Sep 2012 08:24:34 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r240988 - releng/9.1/sys/dev/sound/pci/hda Message-ID: <201209270824.q8R8OYci081976@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Sep 27 08:24:34 2012 New Revision: 240988 URL: http://svn.freebsd.org/changeset/base/240988 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. Approved by: re (kib) Modified: releng/9.1/sys/dev/sound/pci/hda/hdaa.c Directory Properties: releng/9.1/sys/ (props changed) releng/9.1/sys/dev/ (props changed) Modified: releng/9.1/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- releng/9.1/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 08:06:03 2012 (r240987) +++ releng/9.1/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 08:24:34 2012 (r240988) @@ -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"); ); };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209270824.q8R8OYci081976>