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

Commit b68a4238 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: Fix Incall music delivery failure"

parents c222fe7d 195d9bdd

sound/soc/msm/apq8084.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3704,7 +3704,7 @@ static struct snd_soc_dai_link apq8084_common_be_dai_links[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

sound/soc/msm/msm8952-dai-links.c

+2 −2
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ static struct snd_soc_dai_link msm8952_common_be_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,
@@ -1233,7 +1233,7 @@ static struct snd_soc_dai_link msm8952_common_be_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

sound/soc/msm/msm8952.c

+2 −2
Original line number Diff line number Diff line
@@ -2432,7 +2432,7 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,
@@ -2446,7 +2446,7 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_VOICE2_PLAYBACK_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,