Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / pci / aw2 / aw2-alsa.c

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 8d2fee7..1677143 100644 (file)
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -258,8 +258,8 @@ static int snd_aw2_create(struct snd_card *card,
        pci_set_master(pci);
 
        /* check PCI availability (32bit DMA) */
-       if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) ||
-           (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0)) {
+       if ((dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) ||
+           (dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0)) {
                dev_err(card->dev, "Impossible to set 32bit mask DMA\n");
                pci_disable_device(pci);
                return -ENXIO;