From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Feb 2016 16:44:12 +0000 (+0000)
Subject: Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=98ab7a02046dd239f3f2eb923de0ce117dc29e15;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel
---

98ab7a02046dd239f3f2eb923de0ce117dc29e15
diff --cc sound/soc/intel/skylake/skl-topology.c
index 4624556f486d,489848637df5..a294fee431f0
--- a/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;
  	}