diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:08:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:08:07 +0000 |
| commit | 40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a (patch) | |
| tree | ab44af35ae3e75f7fe60391274aa8a0a09a15c15 /sound/soc | |
| parent | 5f948722cd2f797bb2ce7684e72336a5edd149a6 (diff) | |
| parent | 59d9cc2a5073ab4b8c8f8bdbacf230a538abc55d (diff) | |
| download | op-kernel-dev-40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a.zip op-kernel-dev-40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a.tar.gz | |
Merge remote-tracking branch 'asoc/fix/spear' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/spear/spear_pcm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c index 9b76cc5..5e7aebe 100644 --- a/sound/soc/spear/spear_pcm.c +++ b/sound/soc/spear/spear_pcm.c @@ -149,9 +149,9 @@ static void spear_pcm_free(struct snd_pcm *pcm) static u64 spear_pcm_dmamask = DMA_BIT_MASK(32); -static int spear_pcm_new(struct snd_card *card, - struct snd_soc_dai *dai, struct snd_pcm *pcm) +static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd) { + struct snd_card *card = rtd->card->snd_card; int ret; if (!card->dev->dma_mask) @@ -159,16 +159,16 @@ static int spear_pcm_new(struct snd_card *card, if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = DMA_BIT_MASK(32); - if (dai->driver->playback.channels_min) { - ret = spear_pcm_preallocate_dma_buffer(pcm, + if (rtd->cpu_dai->driver->playback.channels_min) { + ret = spear_pcm_preallocate_dma_buffer(rtd->pcm, SNDRV_PCM_STREAM_PLAYBACK, spear_pcm_hardware.buffer_bytes_max); if (ret) return ret; } - if (dai->driver->capture.channels_min) { - ret = spear_pcm_preallocate_dma_buffer(pcm, + if (rtd->cpu_dai->driver->capture.channels_min) { + ret = spear_pcm_preallocate_dma_buffer(rtd->pcm, SNDRV_PCM_STREAM_CAPTURE, spear_pcm_hardware.buffer_bytes_max); if (ret) |
