diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:27 +0100 |
| commit | 49422ad37d90945fe9ad0220d9505e2be6168777 (patch) | |
| tree | 0cdec6cef26842eb4622831e327d6a3fe5f715d6 | |
| parent | 449f1ca6253cb8d7bbe84666ac7d2696308d16c8 (diff) | |
| parent | 8faf141a9903477910387af062ece04ea7d730ed (diff) | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
| -rw-r--r-- | sound/soc/intel/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/intel/baytrail/sst-baytrail-ipc.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/haswell/sst-haswell-ipc.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index cd9aee9871a3..3853ec2ddbc7 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SST) += common/ # Platform Support obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ -obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += atom/ +obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += atom/ # Machine support obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/ diff --git a/sound/soc/intel/baytrail/sst-baytrail-ipc.c b/sound/soc/intel/baytrail/sst-baytrail-ipc.c index 1efb33b36303..a839dbfa5218 100644 --- a/sound/soc/intel/baytrail/sst-baytrail-ipc.c +++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c @@ -759,7 +759,6 @@ fw_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(byt); return err; } 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); |