raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

ALSA: usb-audio: don't log messages meant for 1810c when initializing 1824c

Browse Source 
The log messages for the PreSonus STUDIO 1810c about
device_setup are not applicable to the 1824c, and should
not be logged when 1824c initializes.

Refactor from if statement to switch statement as there
might be more STUDIO series devices added later.

Fixes: 080564558e ("ALSA: usb-audio: enable support for Presonus Studio 1824c within 1810c file")
Signed-off-by: Roy Vegard Ovesen <roy.vegard.ovesen@gmail.com>
Link: https://patch.msgid.link/aPaYTP7ceuABf8c7@ark
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Roy Vegard Ovesen
2025-10-20 22:15:08 +02:00
committed by Takashi Iwai
parent 7963891f7c
commit 75cdae446d
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sound/usb/mixer_s1810c.c
View File

@@ -597,15 +597,6 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
if (!list_empty(&chip->mixer_list)) if (!list_empty(&chip->mixer_list))
return 0; return 0;
dev_info(&dev->dev,
"Presonus Studio 1810c, device_setup: %u\n", chip->setup);
if (chip->setup == 1)
dev_info(&dev->dev, "(8out/18in @ 48kHz)\n");
else if (chip->setup == 2)
dev_info(&dev->dev, "(6out/8in @ 192kHz)\n");
else
dev_info(&dev->dev, "(8out/14in @ 96kHz)\n");
ret = snd_s1810c_init_mixer_maps(chip); ret = snd_s1810c_init_mixer_maps(chip);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -634,16 +625,28 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
if (ret < 0) if (ret < 0)
return ret; return ret;
// The 1824c has a Mono Main switch instead of a switch (chip->usb_id) {
// A/B select switch. case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
if (mixer->chip->usb_id == USB_ID(0x194f, 0x010d)) { dev_info(&dev->dev,
ret = snd_s1810c_switch_init(mixer, &snd_s1824c_mono_sw); "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
if (ret < 0) if (chip->setup == 1)
return ret; dev_info(&dev->dev, "(8out/18in @ 48kHz)\n");
} else if (mixer->chip->usb_id == USB_ID(0x194f, 0x010c)) { else if (chip->setup == 2)
dev_info(&dev->dev, "(6out/8in @ 192kHz)\n");
else
dev_info(&dev->dev, "(8out/14in @ 96kHz)\n");
ret = snd_s1810c_switch_init(mixer, &snd_s1810c_ab_sw); ret = snd_s1810c_switch_init(mixer, &snd_s1810c_ab_sw);
if (ret < 0) if (ret < 0)
return ret; return ret;
break;
case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
ret = snd_s1810c_switch_init(mixer, &snd_s1824c_mono_sw);
if (ret < 0)
return ret;
break;
} }
return ret; return ret;