Merge "ASoC: msm: Add check for both offset and index variable" (6b5e640f) · Commits · e / devices / android_kernel_sony_msm8994

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -154,12 +154,12 @@ static void msm_send_eq_values(int eq_idx);
		* If new back-end is defined, add new back-end DAI ID at the end of enum
		*/


		#define SRS_TRUMEDIA_INDEX 2
		union srs_trumedia_params_u {
		struct srs_trumedia_params srs_params;
		unsigned short int raw_params[1];
		};
		static union srs_trumedia_params_u msm_srs_trumedia_params[2];
		static union srs_trumedia_params_u msm_srs_trumedia_params[SRS_TRUMEDIA_INDEX];
		static int srs_port_id = -1;
		static bool is_custom_stereo_on; /* set to false by default */

		@@ -1281,7 +1281,7 @@ static int msm_routing_set_srs_trumedia_control_(struct snd_kcontrol *kcontrol,
		SRS_PARAM_OFFSET_MASK) >> 16);
		value = (unsigned short)(ucontrol->value.integer.value[0] &
		SRS_PARAM_VALUE_MASK);
		if (offset < max) {
		if ((offset < max) && (index < SRS_TRUMEDIA_INDEX)) {
		msm_srs_trumedia_params[index].raw_params[offset] = value;
		pr_debug("SRS %s: index set... (max %d, requested %d, val %d, paramblockidx %d)",
		__func__, max, offset, value, index);