summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorroger nilsson <roger.xr.nilsson@stericsson.com>2011-04-29 15:10:20 +0200
committerHenrik Aberg <henrik.aberg@stericsson.com>2011-05-18 09:40:09 +0200
commit46de2d76f316d6daa7b1beebe214a212630f6a24 (patch)
tree63db46f1b1e0f9482647558d35459e24545b17e7 /sound
parent924d5af277a0df8d4191174cc4004da837f5b992 (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);