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

[ Upstream commit 50603a67daef161c78c814580d57f7f0be57167e ]

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: Geoffrey D. Bennett <g@b4.vu>
Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface")
Link: https://lore.kernel.org/r/32a5fdc83b05fa74e0fcdd672fbf71d75c5f0a6d.1703001053.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index 5e3118b..087e120 100644 (file)
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -1798,14 +1798,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 = {
@@ -1888,14 +1894,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)
@@ -1921,14 +1933,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,
@@ -1995,14 +2013,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,
@@ -2248,14 +2272,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,
@@ -2306,15 +2336,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,
@@ -2364,14 +2400,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,
@@ -2421,15 +2463,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,
@@ -2601,14 +2649,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(
@@ -2708,14 +2762,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
@@ -2863,14 +2923,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(
@@ -3018,14 +3084,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,
@@ -3396,14 +3468,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,