Merge "ASoC: msm: qdsp6v2: Fix impossible check" into msm-4.9 (c4c02e6e) · Commits · e / devices / android_kernel_fairphone_FP3

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -394,12 +394,13 @@ static int msm_voice_sidetone_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		int ret;
		bool sidetone_enable = ucontrol->value.integer.value[0];
		long value = ucontrol->value.integer.value[0];
		bool sidetone_enable = value;
		uint32_t session_id = ALL_SESSION_VSID;

		if (sidetone_enable < 0) {
		pr_err("%s: Invalid arguments sidetone enable %d\n",
		__func__, sidetone_enable);
		if (value < 0) {
		pr_err("%s: Invalid arguments sidetone enable %ld\n",
		__func__, value);
		ret = -EINVAL;
		return ret;
		}