From: Mark Brown <broonie@kernel.org>
Date: Wed, 10 Feb 2016 19:23:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
X-Git-Tag: v4.5-rc4~21^2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ff60f58e244a4f74589f5c5af1a1f5d4db227c3;p=thirdparty%2Fkernel%2Flinux.git

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

7ff60f58e244a4f74589f5c5af1a1f5d4db227c3
diff --cc sound/soc/intel/skylake/skl-topology.c
index 4624556f486de,489848637df5b..a294fee431f07
--- 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;
  	}