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/sh/siu_pcm.c | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
| download | linux-13b137ef0367237909bb2dc38babfb8305154676.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/sh/siu_pcm.c')
| -rw-r--r-- | sound/soc/sh/siu_pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index a423babcf145..f8f681690a71 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -527,10 +527,11 @@ static snd_pcm_uframes_t siu_pcm_pointer_dma(struct snd_pcm_substream *ss) return bytes_to_frames(ss->runtime, ptr); } -static int siu_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, - struct snd_pcm *pcm) +static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd) { /* card->dev == socdev->dev, see snd_soc_new_pcms() */ + struct snd_card *card = rtd->card->snd_card; + struct snd_pcm *pcm = rtd->pcm; struct siu_info *info = siu_i2s_data; struct platform_device *pdev = to_platform_device(card->dev); int ret; |