Merge "ASoC: msm: Set NULL topology for voice call recording" (10088b51) · 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
		@@ -393,7 +393,7 @@ void msm_pcm_routing_reg_phy_stream(int fedai_id, int perf_mode,

		if (msm_bedais[i].port_id == VOICE_RECORD_RX \|\|
		msm_bedais[i].port_id == VOICE_RECORD_TX)
		topology = DEFAULT_COPP_TOPOLOGY;
		topology = NULL_COPP_TOPOLOGY;
		if ((stream_type == SNDRV_PCM_STREAM_PLAYBACK) &&
		(channels > 0))
		adm_multi_ch_copp_open(msm_bedais[i].port_id,
		@@ -553,7 +553,7 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set)

		if (msm_bedais[reg].port_id == VOICE_RECORD_RX \|\|
		msm_bedais[reg].port_id == VOICE_RECORD_TX)
		topology = DEFAULT_COPP_TOPOLOGY;
		topology = NULL_COPP_TOPOLOGY;
		if ((session_type == SESSION_TYPE_RX) &&
		(channels > 0)) {
		adm_multi_ch_copp_open(msm_bedais[reg].port_id,
		@@ -4145,7 +4145,7 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream)

		if (bedai->port_id == VOICE_RECORD_RX \|\|
		bedai->port_id == VOICE_RECORD_TX)
		topology = DEFAULT_COPP_TOPOLOGY;
		topology = NULL_COPP_TOPOLOGY;
		if ((playback) && (channels > 0)) {
		adm_multi_ch_copp_open(bedai->port_id,
		path_type,