diff options
| author |   Geoffrey D. Bennett <g@b4.vu> | 2021-07-23 05:42:48 +0930 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2021-07-24 10:05:06 +0200 |
| commit | 9ee0fc8366ddce380547878640708f1bd7dd2ead (patch) | |
| tree | 83c595a390a4a16fd54a2326eaa130da9858786b /sound | |
| parent | ALSA: scarlett2: Fix Direct Monitor control name for 2i2 (diff) | |
| download | linux-dev-9ee0fc8366ddce380547878640708f1bd7dd2ead.tar.xz linux-dev-9ee0fc8366ddce380547878640708f1bd7dd2ead.zip | |
ALSA: scarlett2: Correct channel mute status after mute button pressed
After the hardware mute button is pressed, private->vol_updated is set
so that the mute status is invalidated. As the channel mute values may
be affected by the global mute value, update scarlett2_mute_ctl_get()
to call scarlett2_update_volumes() if private->vol_updated is set.
Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/aa18ddbf8d8bd7f31832ab1b6b6057c00b931202.1626959758.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/mixer_scarlett_gen2.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index fa604b61066f..3457fbc8108f 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -1856,9 +1856,15 @@ static int scarlett2_mute_ctl_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol) { struct usb_mixer_elem_info *elem = kctl->private_data; - struct scarlett2_data *private = elem->head.mixer->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_data *private = mixer->private_data; int index = line_out_remap(private, elem->control); + mutex_lock(&private->data_mutex); + if (private->vol_updated) + scarlett2_update_volumes(mixer); + mutex_unlock(&private->data_mutex); + ucontrol->value.integer.value[0] = private->mute_switch[index]; return 0; } |