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/omap/omap-pcm.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index b078ed537bc3..07cf7f46b584 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -328,7 +328,7 @@ int omap_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
| 328 | if (!card->dev->dma_mask) | 328 | if (!card->dev->dma_mask) |
| 329 | card->dev->dma_mask = &omap_pcm_dmamask; | 329 | card->dev->dma_mask = &omap_pcm_dmamask; |
| 330 | if (!card->dev->coherent_dma_mask) | 330 | if (!card->dev->coherent_dma_mask) |
| 331 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 331 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 332 | 332 | ||
| 333 | if (dai->playback.channels_min) { | 333 | if (dai->playback.channels_min) { |
| 334 | ret = omap_pcm_preallocate_dma_buffer(pcm, | 334 | ret = omap_pcm_preallocate_dma_buffer(pcm, |