aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-i2s.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.c')
-rw-r--r--sound/soc/davinci/davinci-i2s.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index f7d7e4c30764..73a0fd8e182f 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -138,7 +138,6 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
138 struct snd_soc_platform *platform = socdev->card->platform; 138 struct snd_soc_platform *platform = socdev->card->platform;
139 int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); 139 int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
140 u32 spcr; 140 u32 spcr;
141 int ret;
142 u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST; 141 u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST;
143 spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG); 142 spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
144 if (spcr & mask) { 143 if (spcr & mask) {
@@ -155,7 +154,7 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
155 /* Stop the DMA to avoid data loss */ 154 /* Stop the DMA to avoid data loss */
156 /* while the transmitter is out of reset to handle XSYNCERR */ 155 /* while the transmitter is out of reset to handle XSYNCERR */
157 if (platform->pcm_ops->trigger) { 156 if (platform->pcm_ops->trigger) {
158 ret = platform->pcm_ops->trigger(substream, 157 int ret = platform->pcm_ops->trigger(substream,
159 SNDRV_PCM_TRIGGER_STOP); 158 SNDRV_PCM_TRIGGER_STOP);
160 if (ret < 0) 159 if (ret < 0)
161 printk(KERN_DEBUG "Playback DMA stop failed\n"); 160 printk(KERN_DEBUG "Playback DMA stop failed\n");
@@ -177,7 +176,7 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
177 176
178 /* Restart the DMA */ 177 /* Restart the DMA */
179 if (platform->pcm_ops->trigger) { 178 if (platform->pcm_ops->trigger) {
180 ret = platform->pcm_ops->trigger(substream, 179 int ret = platform->pcm_ops->trigger(substream,
181 SNDRV_PCM_TRIGGER_START); 180 SNDRV_PCM_TRIGGER_START);
182 if (ret < 0) 181 if (ret < 0)
183 printk(KERN_DEBUG "Playback DMA start failed\n"); 182 printk(KERN_DEBUG "Playback DMA start failed\n");