Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

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

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index b72be035f785b632a415dfcaa9772e0f602eb320..599d2b7eb5b8022b4a8ea0f6f6b9eef72656f470 100644 (file)
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3551,8 +3551,8 @@ int snd_trident_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 30 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(30)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(30)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 30bit PCI busmaster DMA\n");
                pci_disable_device(pci);