Date: Tue, 14 Aug 2012 14:07:34 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r239254 - head/sys/dev/sound/pci/hda Message-ID: <201208141407.q7EE7Yus005509@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Aug 14 14:07:34 2012 New Revision: 239254 URL: http://svn.freebsd.org/changeset/base/239254 Log: Fix multichannel input signals tracing on some CODECs like ALC260. Reported and tested by: Slawa Olhovchenkov <slw@zxy.spb.ru> MFC after: 1 month Modified: head/sys/dev/sound/pci/hda/hdaa.c Modified: head/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdaa.c Tue Aug 14 13:28:30 2012 (r239253) +++ head/sys/dev/sound/pci/hda/hdaa.c Tue Aug 14 14:07:34 2012 (r239254) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208141407.q7EE7Yus005509>