diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 10:47:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 10:47:46 -0500 |
commit | a421018e8c10e5593a1fee076af72a66c3fe8ca3 (patch) | |
tree | 2854511845d0e07d33726a13eda6de1059a5c9df /sound/soc/s6000/s6000-pcm.c | |
parent | 3ad1f3b35e8309ec93454dbf89beaafcdb5312da (diff) | |
parent | 86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (294 commits)
S3C64XX: Staticise platform data for PCM devices
ASoC: Rename controls with a / in wm_hubs
snd-fm801: autodetect SF64-PCR (tuner-only) card
ALSA: tea575x-tuner: fix mute
ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
ASoC: au1x: dbdma2: fix oops on soc device removal.
ALSA: hda - Fix memory leaks in the previous patch
ALSA: hda - Add ALC661/259, ALC892/888VD support
ALSA: opti9xx: remove snd_opti9xx fields
ALSA: aaci - Clean up duplicate code
ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
ALSA: hda - Add position_fix quirk for HP dv3
ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
ALSA: hda - Fix Cxt5047 test mode
ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
ASoC: sh: fsi: Add runtime PM support
sh: ms7724se: Add runtime PM support for FSI
ALSA: hda - Add a position_fix quirk for MSI Wind U115
ALSA: opti-miro: add PnP detection
ALSA: opti-miro: separate comon probing code
...
Diffstat (limited to 'sound/soc/s6000/s6000-pcm.c')
-rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 83b8028e209d..0eb1722f6581 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c | |||
@@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm) | |||
423 | snd_pcm_lib_preallocate_free_for_all(pcm); | 423 | snd_pcm_lib_preallocate_free_for_all(pcm); |
424 | } | 424 | } |
425 | 425 | ||
426 | static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; | 426 | static u64 s6000_pcm_dmamask = DMA_BIT_MASK(32); |
427 | 427 | ||
428 | static int s6000_pcm_new(struct snd_card *card, | 428 | static int s6000_pcm_new(struct snd_card *card, |
429 | struct snd_soc_dai *dai, struct snd_pcm *pcm) | 429 | struct snd_soc_dai *dai, struct snd_pcm *pcm) |
@@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card, | |||
435 | if (!card->dev->dma_mask) | 435 | if (!card->dev->dma_mask) |
436 | card->dev->dma_mask = &s6000_pcm_dmamask; | 436 | card->dev->dma_mask = &s6000_pcm_dmamask; |
437 | if (!card->dev->coherent_dma_mask) | 437 | if (!card->dev->coherent_dma_mask) |
438 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 438 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
439 | 439 | ||
440 | if (params->dma_in) { | 440 | if (params->dma_in) { |
441 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), | 441 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), |