Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / sound / soc / intel / skylake / skl-topology.c

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 489848637df5b38d5b1c7c428512149e4d9589ae..a294fee431f07363f965a81b4c9ef42eb3a42f58 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1536,7 +1536,6 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus)
         */
        ret = snd_soc_tplg_component_load(&platform->component,
                                        &skl_tplg_ops, fw, 0);
-       release_firmware(fw);
        if (ret < 0) {
                dev_err(bus->dev, "tplg component load failed%d\n", ret);
                release_firmware(fw);
@@ -1546,5 +1545,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus)
        skl->resource.max_mcps = SKL_MAX_MCPS;
        skl->resource.max_mem = SKL_FW_MAX_MEM;
 
+       skl->tplg = fw;
+
        return 0;
 }