diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-27 16:42:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-27 16:42:45 +0200 |
| commit | f1a77547c21fe942e95ebaadbc9200f26d138574 (patch) | |
| tree | 3b217b2827e30c840f0747d2cfb861baa656a417 /sound/pci/emu10k1 | |
| parent | 30e5f003ff4b2be86f71733b6c9b11355d66584c (diff) | |
| parent | 8ab418d3651b14d38498d868617a7280ccc6de08 (diff) | |
Merge branch 'for-4.2' into for-next
Diffstat (limited to 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 4f8cf5e7e45f..42ccf47fbb58 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1904,8 +1904,8 @@ int snd_emu10k1_create(struct snd_card *card, /* set the DMA transfer mask */ emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK; - if (pci_set_dma_mask(pci, emu->dma_mask) < 0 || - pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) { + if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 || + dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) { dev_err(card->dev, "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask); |