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

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

Merge "SoC: msm: audio-effects: return directly to avoid integer overflow"

parents d6237cd0 4a49de57

sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c

+30 −30
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"VIRT ENABLE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

				AUDPROC_MODULE_ID_VIRTUALIZER;

				*updt_params++ =
@@ -182,7 +182,7 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"VIRT STRENGTH", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_VIRTUALIZER;

				*updt_params++ =
@@ -210,7 +210,7 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"VIRT OUT_TYPE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_VIRTUALIZER;

				*updt_params++ =
@@ -238,7 +238,7 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"VIRT GAIN_ADJUST", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

				AUDPROC_MODULE_ID_VIRTUALIZER;

				*updt_params++ =
@@ -316,7 +316,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_ENABLE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -344,7 +344,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_MODE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -372,7 +372,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_PRESET", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -400,7 +400,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_WET_MIX", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -428,7 +428,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_GAIN_ADJUST", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -456,7 +456,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_ROOM_LEVEL", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -484,7 +484,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_ROOM_HF_LEVEL", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -512,7 +512,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_DECAY_TIME", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -540,7 +540,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_DECAY_HF_RATIO", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -568,7 +568,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_REFLECTIONS_LEVEL", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

				AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -596,7 +596,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_REFLECTIONS_DELAY", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

				AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -624,7 +624,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_LEVEL", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -652,7 +652,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_DELAY", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -680,7 +680,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_DIFFUSION", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -708,7 +708,7 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"REVERB_DENSITY", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_REVERB;

				*updt_params++ =
@@ -787,7 +787,7 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"BASS_BOOST_ENABLE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_BASS_BOOST;

				*updt_params++ =
@@ -815,7 +815,7 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"BASS_BOOST_MODE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_BASS_BOOST;

				*updt_params++ =
@@ -843,7 +843,7 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"BASS_BOOST_STRENGTH", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_BASS_BOOST;

				*updt_params++ =
@@ -920,7 +920,7 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"PBE_ENABLE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_PBE;

				*updt_params++ =
@@ -946,7 +946,7 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"PBE_PARAM", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_PBE;

				*updt_params++ =
@@ -1031,7 +1031,7 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"EQ_ENABLE", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_POPLESS_EQUALIZER;

				*updt_params++ =
@@ -1099,7 +1099,7 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"EQ_CONFIG", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_POPLESS_EQUALIZER;

				*updt_params++ =
@@ -1150,7 +1150,7 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"EQ_BAND_INDEX", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_POPLESS_EQUALIZER;

				*updt_params++ =
@@ -1182,7 +1182,7 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac, 
						MAX_INBAND_PARAM_SZ,

						"EQ_SINGLE_BAND_FREQ", rc);

				if (rc != 0)

					break;

					goto invalid_config;

				*updt_params++ =

					AUDPROC_MODULE_ID_POPLESS_EQUALIZER;

				*updt_params++ =
@@ -1271,7 +1271,7 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac, 
						"VOLUME/VOLUME2_GAIN_2CH",

						rc);

				if (rc != 0)

					break;

					goto invalid_config;

				if (instance == SOFT_VOLUME_INSTANCE_2)

					*updt_params++ =

						ASM_MODULE_ID_VOL_CTRL2;
@@ -1320,7 +1320,7 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac, 
						"VOLUME/VOLUME2_GAIN_MASTER",

						rc);

				if (rc != 0)

					break;

					goto invalid_config;

				if (instance == SOFT_VOLUME_INSTANCE_2)

					*updt_params++ =

						ASM_MODULE_ID_VOL_CTRL2;