diff options
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index e6a6b991d05..9b5c88ac35b 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
5 | * | 5 | * |
6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> | 6 | * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com> |
7 | * Peter Ujfalusi <peter.ujfalusi@ti.com> | 7 | * Peter Ujfalusi <peter.ujfalusi@ti.com> |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
@@ -366,9 +366,11 @@ static void omap_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
366 | } | 366 | } |
367 | } | 367 | } |
368 | 368 | ||
369 | static int omap_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 369 | static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd) |
370 | struct snd_pcm *pcm) | ||
371 | { | 370 | { |
371 | struct snd_card *card = rtd->card->snd_card; | ||
372 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
373 | struct snd_pcm *pcm = rtd->pcm; | ||
372 | int ret = 0; | 374 | int ret = 0; |
373 | 375 | ||
374 | if (!card->dev->dma_mask) | 376 | if (!card->dev->dma_mask) |
@@ -434,6 +436,6 @@ static void __exit snd_omap_pcm_exit(void) | |||
434 | } | 436 | } |
435 | module_exit(snd_omap_pcm_exit); | 437 | module_exit(snd_omap_pcm_exit); |
436 | 438 | ||
437 | MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); | 439 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); |
438 | MODULE_DESCRIPTION("OMAP PCM DMA module"); | 440 | MODULE_DESCRIPTION("OMAP PCM DMA module"); |
439 | MODULE_LICENSE("GPL"); | 441 | MODULE_LICENSE("GPL"); |