From: Mark Brown <broonie@kernel.org>
Date: Thu, 29 Sep 2016 19:43:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
X-Git-Tag: v4.9-rc1~4^2~4^2~13
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4a2447b483e17c580ed1d7c9cde3267d9c3a380f

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
---

4a2447b483e17c580ed1d7c9cde3267d9c3a380f
diff --cc sound/soc/intel/skylake/skl-sst-utils.c
index ddcb52a51854,3fe939c36e3a..8dc03039b311
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@@ -121,17 -121,12 +121,17 @@@ int snd_skl_get_module_info(struct skl_
  	struct uuid_module *module;
  	uuid_le *uuid_mod;
  
- 	uuid_mod = (uuid_le *)uuid;
+ 	uuid_mod = (uuid_le *)mconfig->guid;
  
 +	if (list_empty(&ctx->uuid_list)) {
 +		dev_err(ctx->dev, "Module list is empty\n");
 +		return -EINVAL;
 +	}
 +
  	list_for_each_entry(module, &ctx->uuid_list, list) {
  		if (uuid_le_cmp(*uuid_mod, module->uuid) == 0) {
- 			dfw_config->module_id = module->id;
- 			dfw_config->is_loadable = module->is_loadable;
+ 			mconfig->id.module_id = module->id;
+ 			mconfig->is_loadable = module->is_loadable;
  
  			return 0;
  		}