diff options
| author | Vijay Mali <vmali@nvidia.com> | 2014-03-20 11:30:29 +0530 |
|---|---|---|
| committer | Martin Chi <mchi@nvidia.com> | 2014-03-25 01:24:27 -0700 |
| commit | 7c144db382e59853e2514588defdb5823adabe8f (patch) | |
| tree | bfbfddf83a0fcae7b5edb32099cfcd507af9c1d6 | |
| parent | fb80b150d06800e74984f801395a762620cd7c09 (diff) | |
asoc: tegra: ingnore dapm timeout for voice DAIs
Bug 1476086
Change-Id: Ia368e64b59d601124b33abaa4b53aa7f6d321d44
Signed-off-by: Vijay Mali <vmali@nvidia.com>
Reviewed-on: http://git-master/r/385535
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Lei Fan <leif@nvidia.com>
Reviewed-by: Martin Chi <mchi@nvidia.com>
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 9780b91e81f0..42c3df560dd9 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -543,7 +543,6 @@ static int tegra_bt_sco_hw_params(struct snd_pcm_substream *substream, dev_err(card->dev, "Can't configure i2s format\n"); return -EINVAL; } - err = snd_soc_dai_set_fmt(rtd->cpu_dai, i2s_daifmt); if (err < 0) { dev_err(card->dev, "cpu_dai fmt not set\n"); @@ -1108,7 +1107,6 @@ static void tegra_bt_voice_call_shutdown(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(rtd->codec->card); - #ifndef CONFIG_ARCH_TEGRA_2x_SOC machine->codec_info[BT_SCO].rate = 0; machine->codec_info[BT_SCO].channels = 0; @@ -1625,6 +1623,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai[NUM_DAI_LINKS] = { .codec_dai_name = "dit-hifi", .init = tegra_rt5640_init, .ops = &tegra_rt5640_bt_sco_ops, + .ignore_pmdown_time = 1, }, [DAI_LINK_VOICE_CALL] = { .name = "VOICE CALL", @@ -1644,6 +1643,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai[NUM_DAI_LINKS] = { .cpu_dai_name = "dit-hifi", .codec_dai_name = "dit-hifi", .ops = &tegra_bt_voice_call_ops, + .ignore_pmdown_time = 1, }, }; |