Merge tag 'usb-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[deliverable/linux.git] / sound / pci / es1938.c

diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index e1858d9d23d8711d29ee131363c7997a090db847..8963d7688fb039db81abed97db9a5898e40401f2 100644 (file)
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1580,8 +1580,8 @@ static int snd_es1938_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 24bit PCI busmaster DMA\n");
                pci_disable_device(pci);