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

Commit 2fdf7d38 authored by Gustaw Lewandowski's avatar Gustaw Lewandowski Committed by Greg Kroah-Hartman
Browse files

ASoC: Intel: Skylake: Fix passing loadable flag for module 



[ Upstream commit c5ed9c547cba1dc1238c6e8a0c290fd62ee6e127 ]

skl_get_module_info() tries to set mconfig->module->loadable before
mconfig->module has been assigned thus flag was always set to false
and driver did not try to load module binaries.

Signed-off-by: default avatarGustaw Lewandowski <gustaw.lewandowski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Tested-by: default avatarLukasz Majczak <lma@semihalf.com>
Link: https://lore.kernel.org/r/20210818075742.1515155-7-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f6ff4d56

sound/soc/intel/skylake/skl-pcm.c

+9 −16
Original line number Diff line number Diff line
@@ -1333,21 +1333,6 @@ static int skl_get_module_info(struct skl_dev *skl, 
		return -EIO;

	}



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

		if (guid_equal(uuid_mod, &module->uuid)) {

			mconfig->id.module_id = module->id;

			if (mconfig->module)

				mconfig->module->loadable = module->is_loadable;

			ret = 0;

			break;

		}

	}



	if (ret)

		return ret;



	uuid_mod = &module->uuid;

	ret = -EIO;

	for (i = 0; i < skl->nr_modules; i++) {

		skl_module = skl->modules[i];

		uuid_tplg = &skl_module->uuid;
@@ -1357,10 +1342,18 @@ static int skl_get_module_info(struct skl_dev *skl, 
			break;

		}

	}



	if (skl->nr_modules && ret)

		return ret;



	ret = -EIO;

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

		if (guid_equal(uuid_mod, &module->uuid)) {

			mconfig->id.module_id = module->id;

			mconfig->module->loadable = module->is_loadable;

			ret = 0;

		}



		for (i = 0; i < MAX_IN_QUEUE; i++) {

			pin_id = &mconfig->m_in_pin[i].id;

			if (guid_equal(&pin_id->mod_uuid, &module->uuid))
@@ -1374,7 +1367,7 @@ static int skl_get_module_info(struct skl_dev *skl, 
		}

	}



	return 0;

	return ret;

}



static int skl_populate_modules(struct skl_dev *skl)