From: Geoffrey D. Bennett Date: Sun, 20 Jun 2021 16:46:41 +0000 (+0930) Subject: ALSA: usb-audio: scarlett2: Add temp variable for consistency X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3eeb2a19dba65fe63dd755e3209831312e0ad9ed;p=linux.git ALSA: usb-audio: scarlett2: Add temp variable for consistency Add index temporary variable to scarlett2_mixer_ctl_put() for consistency with the other *_ctl_put() functions. Signed-off-by: Geoffrey D. Bennett Link: https://lore.kernel.org/r/20210620164641.GA9211@m.b4.vu Signed-off-by: Takashi Iwai --- diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index c1e74918425a7..cb8483d3c58a9 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -1622,18 +1622,19 @@ static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, const struct scarlett2_device_info *info = private->info; const struct scarlett2_ports *ports = info->ports; int oval, val, num_mixer_in, mix_num, err = 0; + int index = elem->control; mutex_lock(&private->data_mutex); - oval = private->mix[elem->control]; + oval = private->mix[index]; val = ucontrol->value.integer.value[0]; num_mixer_in = ports[SCARLETT2_PORT_TYPE_MIX].num[SCARLETT2_PORT_OUT]; - mix_num = elem->control / num_mixer_in; + mix_num = index / num_mixer_in; if (oval == val) goto unlock; - private->mix[elem->control] = val; + private->mix[index] = val; err = scarlett2_usb_set_mix(mixer, mix_num); if (err == 0) err = 1;