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

Commit b3bc53ae authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: fix copp_idx range check"

parents cb5153ff 0fa7eff0

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ int msm_pcm_routing_reg_phy_stream(int fedai_id, int perf_mode, 
					    sample_rate, channels, topology,

					    perf_mode, bits_per_sample,

					    app_type, acdb_dev_id);

			if ((copp_idx < 0) &&

			if ((copp_idx < 0) ||

				(copp_idx >= MAX_COPPS_PER_PORT)) {

				pr_err("%s: adm open failed copp_idx:%d\n",

					__func__, copp_idx);
@@ -5443,7 +5443,7 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream) 
					    sample_rate, channels, topology,

					    fdai->perf_mode, bits_per_sample,

					    app_type, acdb_dev_id);

			if ((copp_idx < 0) &&

			if ((copp_idx < 0) ||

				(copp_idx >= MAX_COPPS_PER_PORT)) {

				pr_err("%s: adm open failed\n", __func__);

				return -EINVAL;