Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:02 +0000 (19:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:02 +0000 (19:23 +0000)
1  2 
sound/soc/intel/skylake/skl-pcm.c
sound/soc/intel/skylake/skl-topology.c
sound/soc/intel/skylake/skl.c

Simple merge
index 4624556f486de34c396a327a0d279a57a1fdbf96,489848637df5b38d5b1c7c428512149e4d9589ae..a294fee431f07363f965a81b4c9ef42eb3a42f58
@@@ -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;
        }
  
Simple merge