ALSA CVS update

D:2003/09/26 15:29:05
C:USB generic driver
A:Takashi Iwai <tiwai@suse.de>
F:usb/usbmixer.c:1.23->1.24
L:probe units even under a selector unit which is marked as ignored or has
L:only a single selector.

diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index f8ead93d0b0b17b8abda9dc142eb9358fe53bdd8..7b350a6a191a8a3563df5761d833314375e833f5 100644 (file)
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -1358,17 +1358,17 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
                return -EINVAL;
        }
 
+       for (i = 0; i < num_ins; i++) {
+               if ((err = parse_audio_unit(state, desc[5 + i])) < 0)
+                       return err;
+       }
+
        if (num_ins == 1) /* only one ? nonsense! */
                return 0;
 
        if (check_ignored_ctl(state, unitid, 0))
                return 0;
 
-       for (i = 0; i < num_ins; i++) {
-               if ((err = parse_audio_unit(state, desc[5 + i])) < 0)
-                       return err;
-       }
-
        cval = snd_magic_kcalloc(usb_mixer_elem_info_t, 0, GFP_KERNEL);
        if (! cval) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");