diff options
| author | Geoffrey D. Bennett <g@b4.vu> | 2021-05-21 17:50:13 +0930 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-05-21 16:22:52 +0200 |
| commit | 265d1a90e4fb6d3264d8122fbd10760e5e733be6 (patch) | |
| tree | 1438a3c0363e4375a5317abdb233e8b173ef26b7 /sound/usb/mixer_quirks.c | |
| parent | 764fa6e686e0107c0357a988d193de04cf047583 (diff) | |
| download | lwn-265d1a90e4fb6d3264d8122fbd10760e5e733be6.tar.gz lwn-265d1a90e4fb6d3264d8122fbd10760e5e733be6.zip | |
ALSA: usb-audio: scarlett2: Improve driver startup messages
Add separate init function to call the existing controls_create
function so a custom error can be displayed if initialisation fails.
Use info level instead of error for notifications.
Display the VID/PID so device_setup is targeted to the right device.
Display "enabled" message to easily confirm that the driver is loaded.
Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/b5d140c65f640faf2427e085fbbc0297b32e5fce.1621584566.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_quirks.c')
| -rw-r--r-- | sound/usb/mixer_quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index fda66b2dbb01..37ad77524c0b 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3060,7 +3060,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ - err = snd_scarlett_gen2_controls_create(mixer); + err = snd_scarlett_gen2_init(mixer); break; case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ |