From d983913b1a1ac10e05be506ef23b9e54784cad83 Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Sun, 3 Oct 2010 16:44:19 -0500 Subject: [PATCH] --- yaml --- r: 216604 b: refs/heads/master c: 94774b28490daf514a4e62fd746315b5089158ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-i2s.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e7a0e7f1632e..9dd2d4341bbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c20c807cf5a13f61193d39bb718f7a9b5df3813 +refs/heads/master: 94774b28490daf514a4e62fd746315b5089158ff diff --git a/trunk/sound/soc/davinci/davinci-i2s.c b/trunk/sound/soc/davinci/davinci-i2s.c index 9f8b6c556866..d46b545d41f4 100644 --- a/trunk/sound/soc/davinci/davinci-i2s.c +++ b/trunk/sound/soc/davinci/davinci-i2s.c @@ -574,10 +574,6 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream, struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); davinci_mcbsp_stop(dev, playback); - if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) { - /* codec is master */ - davinci_mcbsp_start(dev, substream); - } return 0; } @@ -587,8 +583,6 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai); int ret = 0; int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); - if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) - return 0; /* return if codec is master */ switch (cmd) { case SNDRV_PCM_TRIGGER_START: