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

Commit 5d5b275d authored by Lu, Han's avatar Lu, Han Committed by Mark Brown
Browse files

Intel: ASoC: Add condition check before set param to waves 



Check waves state before set parameter through ipc to prevent unexpected
operation. Also remove redundant check.

Signed-off-by: default avatarLu, Han <han.lu@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 91b0d9aa

sound/soc/intel/sst-haswell-ipc.c

+5 −0
Original line number Diff line number Diff line
@@ -2055,6 +2055,11 @@ int sst_hsw_launch_param_buf(struct sst_hsw *hsw) 
{

	int ret, idx;



	if (!sst_hsw_is_module_active(hsw, SST_HSW_MODULE_WAVES)) {

		dev_dbg(hsw->dev, "module waves is not active\n");

		return 0;

	}



	/* put all param lines to DSP through ipc */

	for (idx = 0; idx < hsw->param_idx_w; idx++) {

		ret = sst_hsw_module_set_param(hsw,

sound/soc/intel/sst-haswell-pcm.c

+1 −5
Original line number Diff line number Diff line
@@ -399,13 +399,9 @@ static int hsw_waves_param_put(struct snd_kcontrol *kcontrol, 
	if (ret < 0)

		return ret;



	if (sst_hsw_is_module_loaded(hsw, id)) {

		if (!sst_hsw_is_module_active(hsw, id))

			return 0;



	if (sst_hsw_is_module_active(hsw, id))

		ret = sst_hsw_module_set_param(hsw, id, 0, param_id,

				param_size, ucontrol->value.bytes.data);

	}

	return ret;

}