Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb11ade0 authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Greg Kroah-Hartman
Browse files

ALSA: usb-audio: scarlett2: Fix scarlett2_*_ctl_put() return values 



[ Upstream commit c5d8e008032f3cd5f266d552732973a960b0bd4b ]

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: default avatarGeoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/20210620164645.GA9221@m.b4.vu


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f9e5d013

sound/usb/mixer_scarlett_gen2.c

+8 −0
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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);
@@ -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);