leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: usb-audio: scarlett2: Fix union usage in mixer control callbacks

Browse Source 
Fix mixer control callbacks to use the correct members of the struct
snd_ctl_elem_value. The use of value.integer and value.enumerated were
swapped in a few places.

Update scarlett2_mux_src_enum_ctl_put() to use min() instead of
clamp() as value.enumerated.item is unsigned.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/20210620164647.GA9226@m.b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Geoffrey D. Bennett 2021-06-21 02:16:47 +09:30 committed by Takashi Iwai
parent c5d8e00803
commit 64c02a9d3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/usb/mixer_scarlett_gen2.c
View File

@ -1270,7 +1270,7 @@ static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl,
mutex_lock(&private->data_mutex);
oval = private->vol_sw_hw_switch[index];
val = !!ucontrol->value.integer.value[0];
val = !!ucontrol->value.enumerated.item[0];
if (oval == val)
goto unlock;
@ -1356,7 +1356,7 @@ static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl,
mutex_lock(&private->data_mutex);
oval = private->level_switch[index];
val = !!ucontrol->value.integer.value[0];
val = !!ucontrol->value.enumerated.item[0];
if (oval == val)
goto unlock;
@ -1390,7 +1390,7 @@ static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct scarlett2_data *private = elem->head.mixer->private_data;
ucontrol->value.enumerated.item[0] =
ucontrol->value.integer.value[0] =
private->pad_switch[elem->control];
return 0;
}
@ -1448,7 +1448,7 @@ static int scarlett2_dim_mute_ctl_get(struct snd_kcontrol *kctl,
scarlett2_update_volumes(mixer);
mutex_unlock(&private->data_mutex);
ucontrol->value.enumerated.item[0] = private->dim_mute[elem->control];
ucontrol->value.integer.value[0] = private->dim_mute[elem->control];
return 0;
}
@ -1748,8 +1748,8 @@ static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl,
mutex_lock(&private->data_mutex);
oval = private->mux[index];
val = clamp(ucontrol->value.integer.value[0],
0L, private->num_mux_srcs - 1L);
val = min(ucontrol->value.enumerated.item[0],
private->num_mux_srcs - 1U);
if (oval == val)
goto unlock;