github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: usb-audio: Add missing error checks in snd_ebox44_create_mixer()

Browse Source 
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-04-24 08:07:38 +02:00
parent d34bf14851
commit baba2e0d2b
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sound/usb/mixer_quirks.c
View File

@ -935,26 +935,46 @@ static int snd_ftu_create_mixer(struct usb_mixer_interface *mixer)
static int snd_ebox44_create_mixer(struct usb_mixer_interface *mixer) static int snd_ebox44_create_mixer(struct usb_mixer_interface *mixer)
{ {
snd_create_std_mono_ctl(mixer, 4, 1, 0x0, USB_MIXER_INV_BOOLEAN, int err;
err = snd_create_std_mono_ctl(mixer, 4, 1, 0x0, USB_MIXER_INV_BOOLEAN,
"Headphone Playback Switch", NULL); "Headphone Playback Switch", NULL);
snd_create_std_mono_ctl(mixer, 4, 2, 0x1, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 4, 2, 0x1, USB_MIXER_S16,
"Headphone A Mix Playback Volume", NULL); "Headphone A Mix Playback Volume", NULL);
snd_create_std_mono_ctl(mixer, 4, 2, 0x2, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 4, 2, 0x2, USB_MIXER_S16,
"Headphone B Mix Playback Volume", NULL); "Headphone B Mix Playback Volume", NULL);
if (err < 0)
return err;
snd_create_std_mono_ctl(mixer, 7, 1, 0x0, USB_MIXER_INV_BOOLEAN, err = snd_create_std_mono_ctl(mixer, 7, 1, 0x0, USB_MIXER_INV_BOOLEAN,
"Output Playback Switch", NULL); "Output Playback Switch", NULL);
snd_create_std_mono_ctl(mixer, 7, 2, 0x1, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 7, 2, 0x1, USB_MIXER_S16,
"Output A Playback Volume", NULL); "Output A Playback Volume", NULL);
snd_create_std_mono_ctl(mixer, 7, 2, 0x2, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 7, 2, 0x2, USB_MIXER_S16,
"Output B Playback Volume", NULL); "Output B Playback Volume", NULL);
if (err < 0)
return err;
snd_create_std_mono_ctl(mixer, 10, 1, 0x0, USB_MIXER_INV_BOOLEAN, err = snd_create_std_mono_ctl(mixer, 10, 1, 0x0, USB_MIXER_INV_BOOLEAN,
"Input Capture Switch", NULL); "Input Capture Switch", NULL);
snd_create_std_mono_ctl(mixer, 10, 2, 0x1, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 10, 2, 0x1, USB_MIXER_S16,
"Input A Capture Volume", NULL); "Input A Capture Volume", NULL);
snd_create_std_mono_ctl(mixer, 10, 2, 0x2, USB_MIXER_S16, if (err < 0)
return err;
err = snd_create_std_mono_ctl(mixer, 10, 2, 0x2, USB_MIXER_S16,
"Input B Capture Volume", NULL); "Input B Capture Volume", NULL);
if (err < 0)
return err;
return 0; return 0;
} }