Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: scarlett2: Minor refactor MSD mode check

Browse Source 
Create local variable for storing private data pointer in
snd_scarlett2_controls_create(). It's currently only used for checking
msd_switch, but it will be used again.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/ab50939dca0fdc5fa3493fc8eee3a2fdefffa62d.1703612638.git.g@b4.vu
This commit is contained in:
Geoffrey D. Bennett 2023-12-27 04:37:18 +10:30 committed by Takashi Iwai
parent 0a995e38dc
commit a1ed1d6caf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/usb/mixer_scarlett2.c
View File

@ -5898,6 +5898,7 @@ static int snd_scarlett2_controls_create(
struct usb_mixer_interface *mixer,
const struct scarlett2_device_entry *entry)
{
struct scarlett2_data *private;
int err;
/* Initialise private data */
@ -5905,6 +5906,8 @@ static int snd_scarlett2_controls_create(
if (err < 0)
return err;
private = mixer->private_data;
/* Send proprietary USB initialisation sequence */
err = scarlett2_usb_init(mixer);
if (err < 0)
@ -5931,7 +5934,7 @@ static int snd_scarlett2_controls_create(
return err;
/* If MSD mode is enabled, don't create any other controls */
if (((struct scarlett2_data *)mixer->private_data)->msd_switch)
if (private->msd_switch)
return 0;
/* Create the analogue output controls */