Skip to content

Commit d3a4f78

Browse files
geoffreybennetttiwai
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent cdf7283 commit d3a4f78

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

sound/usb/mixer_scarlett_gen2.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,14 +2530,18 @@ static int scarlett2_add_direct_monitor_ctl(struct usb_mixer_interface *mixer)
25302530
{
25312531
struct scarlett2_data *private = mixer->private_data;
25322532
const struct scarlett2_device_info *info = private->info;
2533+
const char *s;
25332534

25342535
if (!info->direct_monitor)
25352536
return 0;
25362537

2538+
s = info->direct_monitor == 1
2539+
? "Direct Monitor Playback Switch"
2540+
: "Direct Monitor Playback Enum";
2541+
25372542
return scarlett2_add_new_ctl(
25382543
mixer, &scarlett2_direct_monitor_ctl[info->direct_monitor - 1],
2539-
0, 1, "Direct Monitor Playback Switch",
2540-
&private->direct_monitor_ctl);
2544+
0, 1, s, &private->direct_monitor_ctl);
25412545
}
25422546

25432547
/*** Speaker Switching Control ***/

0 commit comments

Comments
 (0)