[Midnightbsd-cvs] src [8052] trunk/sys/dev/sound/pci/hda/hdaa.c: fix multichannel input singals fracing on some CODECs like ALC260

[laffer1 at midnightbsd.org]

Revision: 8052
          http://svnweb.midnightbsd.org/src/?rev=8052
Author:   laffer1
Date:     2016-09-15 17:22:20 -0400 (Thu, 15 Sep 2016)
Log Message:
-----------
fix multichannel input singals fracing on some CODECs like ALC260

Modified Paths:
--------------
    trunk/sys/dev/sound/pci/hda/hdaa.c

Modified: trunk/sys/dev/sound/pci/hda/hdaa.c
===================================================================
--- trunk/sys/dev/sound/pci/hda/hdaa.c	2016-09-15 21:21:14 UTC (rev 8051)
+++ trunk/sys/dev/sound/pci/hda/hdaa.c	2016-09-15 21:22:20 UTC (rev 8052)
@@ -3068,8 +3068,7 @@
 		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 @@
 				    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;
 				}