Unverified Commit 25148f57 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: Add missing checks on FE startup 



Constraint functions have return values, they should be checked for
potential errors.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230519201711.4073845-8-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 320f4d86

sound/soc/intel/avs/pcm.c

+18 −5
Original line number Diff line number Diff line
@@ -468,21 +468,34 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so 


	host_stream = snd_hdac_ext_stream_assign(bus, substream, HDAC_EXT_STREAM_TYPE_HOST);

	if (!host_stream) {

		kfree(data);

		return -EBUSY;

		ret = -EBUSY;

		goto err;

	}



	data->host_stream = host_stream;

	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);

	ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);

	if (ret < 0)

		goto err;



	/* avoid wrap-around with wall-clock */

	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_TIME, 20, 178000000);

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_rates);

	ret = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_TIME, 20, 178000000);

	if (ret < 0)

		goto err;



	ret = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_rates);

	if (ret < 0)

		goto err;



	snd_pcm_set_sync(substream);



	dev_dbg(dai->dev, "%s fe STARTUP tag %d str %p",

		__func__, hdac_stream(host_stream)->stream_tag, substream);



	return 0;



err:

	kfree(data);

	return ret;

}



static void avs_dai_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)