summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorroger nilsson <roger.xr.nilsson@stericsson.com>2011-04-29 15:10:20 +0200
committerLee Jones <lee.jones@linaro.org>2012-01-05 10:03:27 +0000
commit5bbd17c4b7dd7b88dffcd3e01136b6f6ad1bb910 (patch)
tree58849009eecf827d697386c97237cbbe3643bb80 /sound
parenteabe43cae514e60c44d29d584f48a024588b3d9a (diff)
Ux500 ASoC: cg29xx: The I2S PCM interface must not be configured
It is not possible to configure the I2S PCM interface after the SCO link has been setup by the BT stack. ST-Ericsson ID: 337 138 Change-Id: Icc48f76c0d41665988709e4f09856e081c654e8a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21955 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Johan BOHLIN <johan.bohlin@stericsson.com> Tested-by: Johan BOHLIN <johan.bohlin@stericsson.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/cg29xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c
index 363721cc2ca..41d8b11c2db 100644
--- a/sound/soc/codecs/cg29xx.c
+++ b/sound/soc/codecs/cg29xx.c
@@ -500,7 +500,7 @@ static int cg29xx_dai_hw_params(struct snd_pcm_substream *substream,
dai_data->config.conf.i2s_pcm.ratio = ratio;
}
- if (!(dai_data->tx_active | dai_data->rx_active)) {
+ if (!(dai_data->tx_active | dai_data->rx_active) && dai_data->config.port != PORT_1_I2S_PCM) {
err = cg2900_audio_set_dai_config(
codec_private.session,
&dai_data->config);