Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[firefly-linux-kernel-4.4.55.git] / sound / pci / ali5451 / ali5451.c

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index c8d499575c012f35e24d3c9472a7f8d196a84fde..36470af7eda70689619388f6b2e774cf850492cd 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2105,8 +2105,8 @@ static int snd_ali_create(struct snd_card *card,
        if (err < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 31 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(31)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(31)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 31bit PCI busmaster DMA\n");
                pci_disable_device(pci);