Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a74306fe authored by Mark Brown's avatar Mark Brown
Browse files

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

parents b5db6c57 979cf59a

sound/soc/intel/skylake/skl-sst-utils.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,11 @@ int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid, 




	uuid_mod = (uuid_le *)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) {

	list_for_each_entry(module, &ctx->uuid_list, list) {

		if (uuid_le_cmp(*uuid_mod, module->uuid) == 0) {

		if (uuid_le_cmp(*uuid_mod, module->uuid) == 0) {

			dfw_config->module_id = module->id;

			dfw_config->module_id = module->id;

sound/soc/intel/skylake/skl.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci, 




	skl->nhlt = skl_nhlt_init(bus->dev);

	skl->nhlt = skl_nhlt_init(bus->dev);





	if (skl->nhlt == NULL)

	if (skl->nhlt == NULL) {

		err = -ENODEV;

		goto out_free;

		goto out_free;

	}





	skl_nhlt_update_topology_bin(skl);

	skl_nhlt_update_topology_bin(skl);