From: Takashi Iwai Date: Wed, 29 Apr 2015 05:28:29 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d;p=deliverable%2Flinux.git Merge branch 'for-linus' into for-next Conflicts: sound/pci/emu10k1/emu10k1_main.c Signed-off-by: Takashi Iwai --- 49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d diff --cc sound/pci/emu10k1/emu10k1_main.c index 42ccf47fbb58,a4548147c621..54219fd662a1 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@@ -1902,10 -1907,12 +1907,12 @@@ int snd_emu10k1_create(struct snd_card is_audigy = emu->audigy = c->emu10k2_chip; + /* set addressing mode */ + emu->address_mode = is_audigy ? 0 : 1; /* set the DMA transfer mask */ - emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK; + emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_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);