Skip to content

L
linux
Commit 50603a67 authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Takashi Iwai
Browse files
Options

ALSA: scarlett2: Add missing error checks to *_ctl_get() 

The *_ctl_get() functions which call scarlett2_update_*() were not
checking the return value. Fix to check the return value and pass to
the caller.
Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Fixes: 9e4d5c1b ("ALSA: usb-audio: Scarlett Gen 2 mixer interface")
Link: https://lore.kernel.org/r/32a5fdc83b05fa74e0fcdd672fbf71d75c5f0a6d.1703001053.git.g@b4.vuSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ca459dfa
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 52 deletions
sound/usb/mixer_scarlett2.c
View file @ 50603a67
......@@ -2100,14 +2100,20 @@ static int scarlett2_sync_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->sync_updated)
scarlett2_update_sync(mixer);
if (private->sync_updated) {
err = scarlett2_update_sync(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->sync;
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static const struct snd_kcontrol_new scarlett2_sync_ctl = {
......@@ -2190,14 +2196,20 @@ static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->vol_updated)
scarlett2_update_volumes(mixer);
mutex_unlock(&private->data_mutex);
if (private->vol_updated) {
err = scarlett2_update_volumes(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] = private->master_vol;
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int line_out_remap(struct scarlett2_data *private, int index)
......@@ -2223,14 +2235,20 @@ static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int index = line_out_remap(private, elem->control);
int err = 0;
mutex_lock(&private->data_mutex);
if (private->vol_updated)
scarlett2_update_volumes(mixer);
mutex_unlock(&private->data_mutex);
if (private->vol_updated) {
err = scarlett2_update_volumes(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] = private->vol[index];
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_volume_ctl_put(struct snd_kcontrol *kctl,
......@@ -2297,14 +2315,20 @@ static int scarlett2_mute_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int index = line_out_remap(private, elem->control);
int err = 0;
mutex_lock(&private->data_mutex);
if (private->vol_updated)
scarlett2_update_volumes(mixer);
mutex_unlock(&private->data_mutex);
if (private->vol_updated) {
err = scarlett2_update_volumes(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] = private->mute_switch[index];
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_mute_ctl_put(struct snd_kcontrol *kctl,
......@@ -2550,14 +2574,20 @@ static int scarlett2_level_enum_ctl_get(struct snd_kcontrol *kctl,
const struct scarlett2_device_info *info = private->info;
int index = elem->control + info->level_input_first;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->input_other_updated)
scarlett2_update_input_other(mixer);
if (private->input_other_updated) {
err = scarlett2_update_input_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->level_switch[index];
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl,
......@@ -2608,15 +2638,21 @@ static int scarlett2_pad_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->input_other_updated)
scarlett2_update_input_other(mixer);
if (private->input_other_updated) {
err = scarlett2_update_input_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] =
private->pad_switch[elem->control];
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl,
......@@ -2666,14 +2702,20 @@ static int scarlett2_air_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->input_other_updated)
scarlett2_update_input_other(mixer);
if (private->input_other_updated) {
err = scarlett2_update_input_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] = private->air_switch[elem->control];
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_air_ctl_put(struct snd_kcontrol *kctl,
......@@ -2723,15 +2765,21 @@ static int scarlett2_phantom_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->input_other_updated)
scarlett2_update_input_other(mixer);
if (private->input_other_updated) {
err = scarlett2_update_input_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] =
private->phantom_switch[elem->control];
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_phantom_ctl_put(struct snd_kcontrol *kctl,
......@@ -2903,14 +2951,20 @@ static int scarlett2_direct_monitor_ctl_get(
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = elem->head.mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->monitor_other_updated)
scarlett2_update_monitor_other(mixer);
if (private->monitor_other_updated) {
err = scarlett2_update_monitor_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->direct_monitor_switch;
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_direct_monitor_ctl_put(
......@@ -3010,14 +3064,20 @@ static int scarlett2_speaker_switch_enum_ctl_get(
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->monitor_other_updated)
scarlett2_update_monitor_other(mixer);
if (private->monitor_other_updated) {
err = scarlett2_update_monitor_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->speaker_switching_switch;
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
/* when speaker switching gets enabled, switch the main/alt speakers
......@@ -3165,14 +3225,20 @@ static int scarlett2_talkback_enum_ctl_get(
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->monitor_other_updated)
scarlett2_update_monitor_other(mixer);
if (private->monitor_other_updated) {
err = scarlett2_update_monitor_other(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->talkback_switch;
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_talkback_enum_ctl_put(
......@@ -3320,14 +3386,20 @@ static int scarlett2_dim_mute_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_elem_info *elem = kctl->private_data;
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int err = 0;
mutex_lock(&private->data_mutex);
if (private->vol_updated)
scarlett2_update_volumes(mixer);
mutex_unlock(&private->data_mutex);
if (private->vol_updated) {
err = scarlett2_update_volumes(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.integer.value[0] = private->dim_mute[elem->control];
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_dim_mute_ctl_put(struct snd_kcontrol *kctl,
......@@ -3698,14 +3770,20 @@ static int scarlett2_mux_src_enum_ctl_get(struct snd_kcontrol *kctl,
struct usb_mixer_interface *mixer = elem->head.mixer;
struct scarlett2_data *private = mixer->private_data;
int index = line_out_remap(private, elem->control);
int err = 0;
mutex_lock(&private->data_mutex);
if (private->mux_updated)
scarlett2_usb_get_mux(mixer);
if (private->mux_updated) {
err = scarlett2_usb_get_mux(mixer);
if (err < 0)
goto unlock;
}
ucontrol->value.enumerated.item[0] = private->mux[index];
mutex_unlock(&private->data_mutex);
return 0;
unlock:
mutex_unlock(&private->data_mutex);
return err;
}
static int scarlett2_mux_src_enum_ctl_put(struct snd_kcontrol *kctl,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7