diff options
| -rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 9f8b6c556866..d46b545d41f4 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c | |||
| @@ -574,10 +574,6 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream, | |||
| 574 | struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); | 574 | struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); |
| 575 | int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); | 575 | int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); |
| 576 | davinci_mcbsp_stop(dev, playback); | 576 | davinci_mcbsp_stop(dev, playback); |
| 577 | if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) { | ||
| 578 | /* codec is master */ | ||
| 579 | davinci_mcbsp_start(dev, substream); | ||
| 580 | } | ||
| 581 | return 0; | 577 | return 0; |
| 582 | } | 578 | } |
| 583 | 579 | ||
| @@ -587,8 +583,6 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd, | |||
| 587 | struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); | 583 | struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); |
| 588 | int ret = 0; | 584 | int ret = 0; |
| 589 | int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); | 585 | int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); |
| 590 | if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) | ||
| 591 | return 0; /* return if codec is master */ | ||
| 592 | 586 | ||
| 593 | switch (cmd) { | 587 | switch (cmd) { |
| 594 | case SNDRV_PCM_TRIGGER_START: | 588 | case SNDRV_PCM_TRIGGER_START: |
