diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
| commit | 0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c (patch) | |
| tree | ca4884719ad40ba247df7954d8d7cf86b9a01239 /sound/soc/intel/haswell/sst-haswell-ipc.c | |
| parent | 7241ea558c6715501e777396b5fc312c372e11d9 (diff) | |
| parent | d839c98f98826f0c13e46d5a4cecb46dd357b50e (diff) | |
| download | linux-0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c.tar.bz2 | |
Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.1
A few fixes for v4.1, none earth shattering and mostly driver related
except for one change to fix !PM builds for Intel platforms which is
done by adding stubs in the core so other platforms don't run into the
same issue.
Diffstat (limited to 'sound/soc/intel/haswell/sst-haswell-ipc.c')
| -rw-r--r-- | sound/soc/intel/haswell/sst-haswell-ipc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9bbce5..324eceb07b25 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); |