These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / pci / ca0106 / ca0106_main.c

diff --git a/kernel/sound/pci/ca0106/ca0106_main.c b/kernel/sound/pci/ca0106/ca0106_main.c
index dd75b75..d3cd956 100644 (file)
--- a/kernel/sound/pci/ca0106/ca0106_main.c
+++ b/kernel/sound/pci/ca0106/ca0106_main.c
@@ -1676,8 +1676,8 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
        err = pci_enable_device(pci);
        if (err < 0)
                return err;
-       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, "error to set 32bit mask DMA\n");
                pci_disable_device(pci);
                return -ENXIO;
@@ -1885,7 +1885,7 @@ static int snd_ca0106_probe(struct pci_dev *pci,
                goto error;
        dev_dbg(card->dev, " done.\n");
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
        snd_ca0106_proc_init(chip);
 #endif