Skip to content

Commit

Permalink
ALSA: usb-audio: scarlett2: Fix scarlett2_*_ctl_put() return values
Browse files Browse the repository at this point in the history
[ Upstream commit c5d8e00 ]

Mixer control put callbacks should return 1 if the value is changed.
Fix the sw_hw, level, pad, and button controls accordingly.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/20210620164645.GA9221@m.b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
geoffreybennett authored and gregkh committed Jul 20, 2021
1 parent 3005d48 commit 16668cc
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions sound/usb/mixer_scarlett_gen2.c
Expand Up @@ -1184,6 +1184,8 @@ static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl,
/* Send SW/HW switch change to the device */
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH,
index, val);
if (err == 0)
err = 1;

unlock:
mutex_unlock(&private->data_mutex);
Expand Down Expand Up @@ -1244,6 +1246,8 @@ static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl,
/* Send switch change to the device */
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH,
index, val);
if (err == 0)
err = 1;

unlock:
mutex_unlock(&private->data_mutex);
Expand Down Expand Up @@ -1294,6 +1298,8 @@ static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl,
/* Send switch change to the device */
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH,
index, val);
if (err == 0)
err = 1;

unlock:
mutex_unlock(&private->data_mutex);
Expand Down Expand Up @@ -1349,6 +1355,8 @@ static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl,
/* Send switch change to the device */
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS,
index, val);
if (err == 0)
err = 1;

unlock:
mutex_unlock(&private->data_mutex);
Expand Down

0 comments on commit 16668cc

Please sign in to comment.