projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMA-API: sound: fix dma mask handling in a lot of drivers
[linux-2.6-microblaze.git]
/
sound
/
soc
/
kirkwood
/
kirkwood-dma.c
diff --git
a/sound/soc/kirkwood/kirkwood-dma.c
b/sound/soc/kirkwood/kirkwood-dma.c
index
b238434
..
3814bb0
100644
(file)
--- a/
sound/soc/kirkwood/kirkwood-dma.c
+++ b/
sound/soc/kirkwood/kirkwood-dma.c
@@
-59,8
+59,6
@@
static struct snd_pcm_hardware kirkwood_dma_snd_hw = {
.fifo_size = 0,
};
.fifo_size = 0,
};
-static u64 kirkwood_dma_dmamask = DMA_BIT_MASK(32);
-
static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
{
struct kirkwood_dma_data *priv = dev_id;
static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
{
struct kirkwood_dma_data *priv = dev_id;
@@
-292,10
+290,9
@@
static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
struct snd_pcm *pcm = rtd->pcm;
int ret;
struct snd_pcm *pcm = rtd->pcm;
int ret;
- if (!card->dev->dma_mask)
- card->dev->dma_mask = &kirkwood_dma_dmamask;
- if (!card->dev->coherent_dma_mask)
- card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
+ ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
+ if (ret)
+ return ret;
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
ret = kirkwood_dma_preallocate_dma_buffer(pcm,
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
ret = kirkwood_dma_preallocate_dma_buffer(pcm,