ALSA: usb-audio: Add missing error checks in snd_ebox44_create_mixer()
authorTakashi Iwai <tiwai@suse.de>
Tue, 24 Apr 2012 06:07:38 +0000 (08:07 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 24 Apr 2012 06:07:38 +0000 (08:07 +0200)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/mixer_quirks.c

index b44df6e5109b85a8419e481ab00c02d764bbf8ea..12125ca7167fb820d7352e1de8d0f90d9a792520 100644 (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)
 {
-       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);
-       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);
-       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);
+       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);
-       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);
-       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);
+       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);
-       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);
-       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);
+       if (err < 0)
+               return err;
 
        return 0;
 }