diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 53b9fb127a6d..d38e39575f51 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c | |||
| @@ -81,7 +81,7 @@ static struct snd_pcm_ops pxa2xx_pcm_ops = { | |||
| 81 | .mmap = pxa2xx_pcm_mmap, | 81 | .mmap = pxa2xx_pcm_mmap, |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK; | 84 | static u64 pxa2xx_pcm_dmamask = DMA_BIT_MASK(32); |
| 85 | 85 | ||
| 86 | static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 86 | static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, |
| 87 | struct snd_pcm *pcm) | 87 | struct snd_pcm *pcm) |
| @@ -91,7 +91,7 @@ static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
| 91 | if (!card->dev->dma_mask) | 91 | if (!card->dev->dma_mask) |
| 92 | card->dev->dma_mask = &pxa2xx_pcm_dmamask; | 92 | card->dev->dma_mask = &pxa2xx_pcm_dmamask; |
| 93 | if (!card->dev->coherent_dma_mask) | 93 | if (!card->dev->coherent_dma_mask) |
| 94 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 94 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 95 | 95 | ||
| 96 | if (dai->playback.channels_min) { | 96 | if (dai->playback.channels_min) { |
| 97 | ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, | 97 | ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, |