diff options
author | roger nilsson <roger.xr.nilsson@stericsson.com> | 2011-04-29 15:10:20 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:49 +0200 |
commit | e0908366db21e3f3744a8599ddf7dc1bc852b3c4 (patch) | |
tree | 7ea326a491d846614fdc9b2ba905654bfb5c3a29 /sound | |
parent | b3fbaad64c8b7d52e5938098f3705d70bef0ad97 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c index 90786b35576..de82e620b9a 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); |