redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

hifive-unleashed-5.1
Mark Brown 2016-08-24 19:05:20 +01:00
parent b5db6c57c9 979cf59acc
commit a74306fe94
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/intel/skylake/skl-sst-utils.c
View File

@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid,
uuid_mod = (uuid_le *)uuid;
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;

4
sound/soc/intel/skylake/skl.c
View File

@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci,
skl->nhlt = skl_nhlt_init(bus->dev);
if (skl->nhlt == NULL)
if (skl->nhlt == NULL) {
err = -ENODEV;
goto out_free;
}
skl_nhlt_update_topology_bin(skl);