]> err.no Git - linux-2.6/commitdiff
[ALSA] usb: usbmixer error path fix
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>
Mon, 8 Jan 2007 10:25:30 +0000 (11:25 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 9 Jan 2007 08:06:19 +0000 (09:06 +0100)
Without the patch below namelist[0] will not be freed in case
of kmalloc error.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/usb/usbmixer.c

index e74eb1bc8d8778e97eb6fd93e65c2b60568b7fe5..7b3bf3545a3bd880cf911d4c39756aac93f1586e 100644 (file)
@@ -1526,7 +1526,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsi
                namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
                if (! namelist[i]) {
                        snd_printk(KERN_ERR "cannot malloc\n");
-                       while (--i > 0)
+                       while (i--)
                                kfree(namelist[i]);
                        kfree(namelist);
                        kfree(cval);