diff options
| author | roger nilsson <roger.xr.nilsson@stericsson.com> | 2011-04-29 15:10:20 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-04-29 15:25:45 +0200 |
| commit | 0f88d0ceafabf47d4c1de0e2a0ca0c22e966b0a8 (patch) | |
| tree | e0817a306c04c516c89eb7e056db274b94d966e2 /sound | |
| parent | 69f7772b447f4cddc37a096de2c98a7dbf2b045d (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 c592a580a8a..a480e580049 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); |