diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 17:47:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 17:47:09 -0800 |
commit | c4319c7db8c3805e4811eaceeee6c2fa51411bd4 (patch) | |
tree | d47c9a0e422695fba3120af9fa3310e811bba723 /sound/core/jack.c | |
parent | fbd71844852c9458bf73c7cbdae7189c2d4b377c (diff) | |
parent | 11be6a269d2ad3e94c0597f21786092b8340a822 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
eukrea-tlv320: fix platform_name
ASoC: correct pxa AC97 DAI names
ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs
ALSA: HDA: Add ideapad quirk for two Dell machines
ALSA: HDA: Add a new Conexant codec 506e (20590)
ALSA: usb-audio: fix oops due to cleanup race when disconnecting
ASoC: Hook wm_hubs micbiases up to CLK_SYS
ASoC: Correct definition of WM8903_VMID_RES_5K
ASoC: Fix WM8958 default microphone detection argument ordering
ALSA: HDA: Fix mic initialization in VIA auto parser
ALSA: fix one memory leak in sound jack
Diffstat (limited to 'sound/core/jack.c')
-rw-r--r-- | sound/core/jack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 4902ae56873..53b53e97c89 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -141,6 +141,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, fail_input: input_free_device(jack->input_dev); + kfree(jack->id); kfree(jack); return err; } |