From 46de2d76f316d6daa7b1beebe214a212630f6a24 Mon Sep 17 00:00:00 2001 From: roger nilsson Date: Fri, 29 Apr 2011 15:10:20 +0200 Subject: 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 Reviewed-by: Johan BOHLIN Tested-by: Johan BOHLIN --- sound/soc/codecs/cg29xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound') 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); -- cgit v1.2.3