mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
ALSA: scarlett2: Fix Direct Monitor control name for 2i2
The Direct Monitor control for the 2i2 is an enumerated value, not a boolean. Fix the control name to say "Playback Enum" instead of "Playback Switch" in this case. Signed-off-by: Geoffrey D. Bennett <g@b4.vu> Link: https://lore.kernel.org/r/faf5de1d2100038e7d07520d770fda4a1adc276a.1626959758.git.g@b4.vu Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
cdf72837cd
commit
d3a4f784d2
1 changed files with 6 additions and 2 deletions
|
@ -2530,14 +2530,18 @@ static int scarlett2_add_direct_monitor_ctl(struct usb_mixer_interface *mixer)
|
||||||
{
|
{
|
||||||
struct scarlett2_data *private = mixer->private_data;
|
struct scarlett2_data *private = mixer->private_data;
|
||||||
const struct scarlett2_device_info *info = private->info;
|
const struct scarlett2_device_info *info = private->info;
|
||||||
|
const char *s;
|
||||||
|
|
||||||
if (!info->direct_monitor)
|
if (!info->direct_monitor)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
s = info->direct_monitor == 1
|
||||||
|
? "Direct Monitor Playback Switch"
|
||||||
|
: "Direct Monitor Playback Enum";
|
||||||
|
|
||||||
return scarlett2_add_new_ctl(
|
return scarlett2_add_new_ctl(
|
||||||
mixer, &scarlett2_direct_monitor_ctl[info->direct_monitor - 1],
|
mixer, &scarlett2_direct_monitor_ctl[info->direct_monitor - 1],
|
||||||
0, 1, "Direct Monitor Playback Switch",
|
0, 1, s, &private->direct_monitor_ctl);
|
||||||
&private->direct_monitor_ctl);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*** Speaker Switching Control ***/
|
/*** Speaker Switching Control ***/
|
||||||
|
|
Loading…
Reference in a new issue