Author: hselasky
Date: Mon Apr 13 16:22:15 2020
New Revision: 359872
URL: https://svnweb.freebsd.org/changeset/base/359872
Log:
MFC r359321:
Factor out USB audio mixer value range check.
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sound/usb/uaudio.c
==============================================================================
--- stable/10/sys/dev/sound/usb/uaudio.c Mon Apr 13 16:21:38 2020
(r359871)
+++ stable/10/sys/dev/sound/usb/uaudio.c Mon Apr 13 16:22:15 2020
(r359872)
@@ -5380,25 +5380,19 @@ uaudio_mixer_bsd2value(struct uaudio_mixer_node *mc, i
{
if (mc->type == MIX_ON_OFF) {
val = (val != 0);
- } else if (mc->type == MIX_SELECTOR) {
- if ((val < mc->minval) ||
- (val > mc->maxval)) {
- val = mc->minval;
- }
- } else {
+ } else if (mc->type != MIX_SELECTOR) {
/* compute actual volume */
val = (val * mc->mul) / 100;
/* add lower offset */
val = val + mc->minval;
-
- /* make sure we don't write a value out of range */
- if (val > mc->maxval)
- val = mc->maxval;
- else if (val < mc->minval)
- val = mc->minval;
}
+ /* make sure we don't write a value out of range */
+ if (val > mc->maxval)
+ val = mc->maxval;
+ else if (val < mc->minval)
+ val = mc->minval;
DPRINTFN(6, "type=0x%03x val=%d min=%d max=%d val=%d\n",
mc->type, val, mc->minval, mc->maxval, val);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
