svn commit: r240429 - stable/8/sys/dev/sound/pci/hda

[Alexander Motin]

Author: mav
Date: Thu Sep 13 00:39:44 2012
New Revision: 240429
URL: http://svn.freebsd.org/changeset/base/240429

Log:
  MFC r239254:
  Fix multichannel input signals tracing on some CODECs like ALC260.

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 13 00:36:56 2012	(r240428)
+++ stable/8/sys/dev/sound/pci/hda/hdaa.c	Thu Sep 13 00:39:44 2012	(r240429)
@@ -3068,8 +3068,7 @@ hdaa_audio_trace_adc(struct hdaa_devinfo
 		if ((only == 0 || only == w->nid) && (w->nid >= min) &&
 		    (onlylength == 0 || onlylength == depth)) {
 			m = w->nid;
-			if (length != NULL)
-				*length = depth;
+			*length = depth;
 		}
 		break;
 	case HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX:
@@ -3092,12 +3091,12 @@ hdaa_audio_trace_adc(struct hdaa_devinfo
 				    j, mixed, min, only, depth + 1,
 				    length, onlylength)) != 0) {
 					if (m == 0 || ret < m ||
-					    (ret == m && length != NULL &&
-					     *length < lm)) {
+					    (ret == m && *length < lm)) {
 						m = ret;
 						im = i;
 						lm = *length;
-					}
+					} else
+						*length = lm;
 					if (only)
 						break;
 				}