aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bf5xx-i2s-pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/blackfin/bf5xx-i2s-pcm.c')
-rw-r--r--sound/soc/blackfin/bf5xx-i2s-pcm.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index f1fd95bb641..61ddf942fd4 100644
--- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
@@ -168,7 +168,7 @@ static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
168 168
169 snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware); 169 snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
170 170
171 ret = snd_pcm_hw_constraint_integer(runtime, \ 171 ret = snd_pcm_hw_constraint_integer(runtime,
172 SNDRV_PCM_HW_PARAM_PERIODS); 172 SNDRV_PCM_HW_PARAM_PERIODS);
173 if (ret < 0) 173 if (ret < 0)
174 goto out; 174 goto out;
@@ -257,9 +257,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
257 257
258static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); 258static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
259 259
260int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai, 260int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
261 struct snd_pcm *pcm)
262{ 261{
262 struct snd_card *card = rtd->card->snd_card;
263 struct snd_soc_dai *dai = rtd->cpu_dai;
264 struct snd_pcm *pcm = rtd->pcm;
263 int ret = 0; 265 int ret = 0;
264 266
265 pr_debug("%s enter\n", __func__); 267 pr_debug("%s enter\n", __func__);
@@ -304,8 +306,8 @@ static int __devexit bfin_i2s_soc_platform_remove(struct platform_device *pdev)
304 306
305static struct platform_driver bfin_i2s_pcm_driver = { 307static struct platform_driver bfin_i2s_pcm_driver = {
306 .driver = { 308 .driver = {
307 .name = "bfin-i2s-pcm-audio", 309 .name = "bfin-i2s-pcm-audio",
308 .owner = THIS_MODULE, 310 .owner = THIS_MODULE,
309 }, 311 },
310 312
311 .probe = bfin_i2s_soc_platform_probe, 313 .probe = bfin_i2s_soc_platform_probe,