diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/core/jack.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 4902ae568730..53b53e97c896 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, | |||
| 141 | 141 | ||
| 142 | fail_input: | 142 | fail_input: |
| 143 | input_free_device(jack->input_dev); | 143 | input_free_device(jack->input_dev); |
| 144 | kfree(jack->id); | ||
| 144 | kfree(jack); | 145 | kfree(jack); |
| 145 | return err; | 146 | return err; |
| 146 | } | 147 | } |