diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
| commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
| tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /sound/soc/imx/imx-ssi.c | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/imx/imx-ssi.c')
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 61fceb09cdb..10a8e278375 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -388,10 +388,11 @@ static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) static u64 imx_pcm_dmamask = DMA_BIT_MASK(32); -int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, - struct snd_pcm *pcm) +int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) { - + struct snd_card *card = rtd->card->snd_card; + struct snd_soc_dai *dai = rtd->cpu_dai; + struct snd_pcm *pcm = rtd->pcm; int ret = 0; if (!card->dev->dma_mask) |