redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'asoc/fix/spear' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2013-03-26 14:08:07 +00:00
parent 5f948722cd 59d9cc2a50
commit 40bac28eb1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/spear/spear_pcm.c
View file

@ -149,9 +149,9 @@ static void spear_pcm_free(struct snd_pcm *pcm)
static u64 spear_pcm_dmamask = DMA_BIT_MASK(32); static u64 spear_pcm_dmamask = DMA_BIT_MASK(32);
static int spear_pcm_new(struct snd_card *card, static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dai *dai, struct snd_pcm *pcm)
{ {
struct snd_card *card = rtd->card->snd_card;
int ret; int ret;
if (!card->dev->dma_mask) if (!card->dev->dma_mask)
@ -159,16 +159,16 @@ static int spear_pcm_new(struct snd_card *card,
if (!card->dev->coherent_dma_mask) if (!card->dev->coherent_dma_mask)
card->dev->coherent_dma_mask = DMA_BIT_MASK(32); card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
if (dai->driver->playback.channels_min) { if (rtd->cpu_dai->driver->playback.channels_min) {
ret = spear_pcm_preallocate_dma_buffer(pcm, ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,
SNDRV_PCM_STREAM_PLAYBACK, SNDRV_PCM_STREAM_PLAYBACK,
spear_pcm_hardware.buffer_bytes_max); spear_pcm_hardware.buffer_bytes_max);
if (ret) if (ret)
return ret; return ret;
} }
if (dai->driver->capture.channels_min) { if (rtd->cpu_dai->driver->capture.channels_min) {
ret = spear_pcm_preallocate_dma_buffer(pcm, ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,
SNDRV_PCM_STREAM_CAPTURE, SNDRV_PCM_STREAM_CAPTURE,
spear_pcm_hardware.buffer_bytes_max); spear_pcm_hardware.buffer_bytes_max);
if (ret) if (ret)