Author: mav
Date: Thu Sep 13 00:36:56 2012
New Revision: 240428
URL: http://svn.freebsd.org/changeset/base/240428
Log:
MFC r239254:
Fix multichannel input signals tracing on some CODECs like ALC260.
Modified:
stable/9/sys/dev/sound/pci/hda/hdaa.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/9/sys/dev/sound/pci/hda/hdaa.c Thu Sep 13 00:36:46 2012
(r240427)
+++ stable/9/sys/dev/sound/pci/hda/hdaa.c Thu Sep 13 00:36:56 2012
(r240428)
@@ -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;
}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
