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

Commit 29ca11b2 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: Add a missing fix for selecting VSID" into msm-4.9

parents eb698d4f 779e9441

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -153,27 +153,27 @@ static int msm_pcm_open(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct msm_voice *voice;

	struct msm_voice *voice;





	if (!strcmp("VoLTE", substream->pcm->id)) {

	if (!strncmp("VoLTE", substream->pcm->id, 5)) {

		voice = &voice_info[VOLTE_SESSION_INDEX];

		voice = &voice_info[VOLTE_SESSION_INDEX];

		pr_debug("%s: Open VoLTE Substream Id=%s\n",

		pr_debug("%s: Open VoLTE Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);

	} else if (!strcmp("Voice2", substream->pcm->id)) {

	} else if (!strncmp("Voice2", substream->pcm->id, 6)) {

		voice = &voice_info[VOICE2_SESSION_INDEX];

		voice = &voice_info[VOICE2_SESSION_INDEX];

		pr_debug("%s: Open Voice2 Substream Id=%s\n",

		pr_debug("%s: Open Voice2 Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);

	} else if (!strcmp("QCHAT", substream->pcm->id)) {

	} else if (!strncmp("QCHAT", substream->pcm->id, 5)) {

		voice = &voice_info[QCHAT_SESSION_INDEX];

		voice = &voice_info[QCHAT_SESSION_INDEX];

		pr_debug("%s: Open QCHAT Substream Id=%s\n",

		pr_debug("%s: Open QCHAT Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);

	} else if (!strcmp("VoWLAN", substream->pcm->id)) {

	} else if (!strncmp("VoWLAN", substream->pcm->id, 6)) {

		voice = &voice_info[VOWLAN_SESSION_INDEX];

		voice = &voice_info[VOWLAN_SESSION_INDEX];

		pr_debug("%s: Open VoWLAN Substream Id=%s\n",

		pr_debug("%s: Open VoWLAN Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);

	} else if (!strcmp("VoiceMMode1", substream->pcm->id)) {

	} else if (!strncmp("VoiceMMode1", substream->pcm->id, 11)) {

		voice = &voice_info[VOICEMMODE1_INDEX];

		voice = &voice_info[VOICEMMODE1_INDEX];

		pr_debug("%s: Open VoiceMMode1 Substream Id=%s\n",

		pr_debug("%s: Open VoiceMMode1 Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);

	} else if (!strcmp("VoiceMMode2", substream->pcm->id)) {

	} else if (!strncmp("VoiceMMode2", substream->pcm->id, 11)) {

		voice = &voice_info[VOICEMMODE2_INDEX];

		voice = &voice_info[VOICEMMODE2_INDEX];

		pr_debug("%s: Open VoiceMMode2 Substream Id=%s\n",

		pr_debug("%s: Open VoiceMMode2 Substream Id=%s\n",

			 __func__, substream->pcm->id);

			 __func__, substream->pcm->id);