diff options
author | Dave Jones <davej@redhat.com> | 2006-03-06 07:26:10 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:35:19 -0500 |
commit | a2df813beab42740fa8043b3fdc9e1d15784b9ec (patch) | |
tree | 70b83d5edd48ad5a4649e7bb5a3bf3e8ab4fd07b /sound | |
parent | 4fcf0117d599965a5916985c9923776628e16779 (diff) |
[ALSA] fix usbmixer double kfree
Modules: USB generic driver
snd_ctl_add() kfree's the kcontrol already if we fail there,
so this driver is currently doing a double kfree.
Coverity bug #959
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/usbmixer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 678dac2d4dba..0bfea7237395 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -434,7 +434,6 @@ static int add_control_to_empty(struct mixer_build *state, struct snd_kcontrol * | |||
434 | kctl->id.index++; | 434 | kctl->id.index++; |
435 | if ((err = snd_ctl_add(state->chip->card, kctl)) < 0) { | 435 | if ((err = snd_ctl_add(state->chip->card, kctl)) < 0) { |
436 | snd_printd(KERN_ERR "cannot add control (err = %d)\n", err); | 436 | snd_printd(KERN_ERR "cannot add control (err = %d)\n", err); |
437 | snd_ctl_free_one(kctl); | ||
438 | return err; | 437 | return err; |
439 | } | 438 | } |
440 | cval->elem_id = &kctl->id; | 439 | cval->elem_id = &kctl->id; |