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

diff --cc sound/soc/intel/skylake/skl-pcm.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
index 4624556f486de34c396a327a0d279a57a1fdbf96,489848637df5b38d5b1c7c428512149e4d9589ae..a294fee431f07363f965a81b4c9ef42eb3a42f58
--- 1/sound/soc/intel/skylake/skl-topology.c
--- 2/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@@ -1508,8 -1536,10 +1536,9 @@@ int skl_tplg_init(struct snd_soc_platfo
         */
        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);
                return -EINVAL;
        }
  

diff --cc sound/soc/intel/skylake/skl.c
Simple merge