aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106/ca0106_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ca0106/ca0106_main.c')
-rw-r--r--sound/pci/ca0106/ca0106_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index dd75b7536fa2..d3cd95633ee2 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1676,8 +1676,8 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
1676 err = pci_enable_device(pci); 1676 err = pci_enable_device(pci);
1677 if (err < 0) 1677 if (err < 0)
1678 return err; 1678 return err;
1679 if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 || 1679 if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
1680 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { 1680 dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
1681 dev_err(card->dev, "error to set 32bit mask DMA\n"); 1681 dev_err(card->dev, "error to set 32bit mask DMA\n");
1682 pci_disable_device(pci); 1682 pci_disable_device(pci);
1683 return -ENXIO; 1683 return -ENXIO;
@@ -1885,7 +1885,7 @@ static int snd_ca0106_probe(struct pci_dev *pci,
1885 goto error; 1885 goto error;
1886 dev_dbg(card->dev, " done.\n"); 1886 dev_dbg(card->dev, " done.\n");
1887 1887
1888#ifdef CONFIG_PROC_FS 1888#ifdef CONFIG_SND_PROC_FS
1889 snd_ca0106_proc_init(chip); 1889 snd_ca0106_proc_init(chip);
1890#endif 1890#endif
1891 1891