diff options
Diffstat (limited to 'sound/usb/usbmixer.c')
| -rw-r--r-- | sound/usb/usbmixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 678dac2d4dba..8d08b34a1cb5 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; |
| @@ -1469,6 +1468,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsi | |||
| 1469 | kctl = snd_ctl_new1(&mixer_selectunit_ctl, cval); | 1468 | kctl = snd_ctl_new1(&mixer_selectunit_ctl, cval); |
| 1470 | if (! kctl) { | 1469 | if (! kctl) { |
| 1471 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); | 1470 | snd_printk(KERN_ERR "cannot malloc kcontrol\n"); |
| 1471 | kfree(namelist); | ||
| 1472 | kfree(cval); | 1472 | kfree(cval); |
| 1473 | return -ENOMEM; | 1473 | return -ENOMEM; |
| 1474 | } | 1474 | } |
