Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49422ad3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents 449f1ca6 8faf141a

sound/soc/intel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

sound/soc/intel/baytrail/sst-baytrail-ipc.c

+0 −1
Original line number Diff line number Diff line
@@ -759,7 +759,6 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata) 
dsp_new_err:

	sst_ipc_fini(ipc);

ipc_init_err:

	kfree(byt);



	return err;

}

sound/soc/intel/haswell/sst-haswell-ipc.c

+0 −1
Original line number Diff line number Diff line
@@ -2201,7 +2201,6 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) 
dsp_new_err:

	sst_ipc_fini(ipc);

ipc_init_err:

	kfree(hsw);

	return ret;

}

EXPORT_SYMBOL_GPL(sst_hsw_dsp_init);