diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:34 +0100 |
| commit | f81483aaeb59da530b286fe5d081e1705eb5c886 (patch) | |
| tree | a4fed750afcdf61df3a2e3c7ab4456c515651290 /sound/usb/mixer_quirks.c | |
| parent | ALSA: hda/realtek: Use ALC285_FIXUP_HP_GPIO_LED on another HP laptop (diff) | |
| parent | ALSA: hda/cs8409: Fix Jack detection after resume (diff) | |
| download | linux-f81483aaeb59da530b286fe5d081e1705eb5c886.tar.xz linux-f81483aaeb59da530b286fe5d081e1705eb5c886.zip | |
Merge branch 'for-next' into for-linus
Pull 5.17 materials.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_quirks.c')
| -rw-r--r-- | sound/usb/mixer_quirks.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 823b6b8de942..e447ddd6854c 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3254,7 +3254,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) err = snd_rme_controls_create(mixer); break; - case USB_ID(0x0194f, 0x010c): /* Presonus Studio 1810c */ + case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */ err = snd_sc1810_init_mixer(mixer); break; case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */ @@ -3280,7 +3280,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) return err; } -#ifdef CONFIG_PM void snd_usb_mixer_resume_quirk(struct usb_mixer_interface *mixer) { switch (mixer->chip->usb_id) { @@ -3289,7 +3288,6 @@ void snd_usb_mixer_resume_quirk(struct usb_mixer_interface *mixer) break; } } -#endif void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer, int unitid) |