Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
pci
/
sonicvibes.c
diff --git
a/kernel/sound/pci/sonicvibes.c
b/kernel/sound/pci/sonicvibes.c
index
0f40624
..
1b6fad7
100644
(file)
--- a/
kernel/sound/pci/sonicvibes.c
+++ b/
kernel/sound/pci/sonicvibes.c
@@
-1259,8
+1259,8
@@
static int snd_sonicvibes_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 ((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);
dev_err(card->dev,
"architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);