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

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

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index c3a9f39..bc81b9f 100644 (file)
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1269,7 +1269,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                dev_err(&pci->dev,
                        "architecture does not support 32bit PCI busmaster DMA\n");
                pci_disable_device(pci);