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
/
aw2
/
aw2-alsa.c
diff --git
a/kernel/sound/pci/aw2/aw2-alsa.c
b/kernel/sound/pci/aw2/aw2-alsa.c
index
8d2fee7
..
1677143
100644
(file)
--- a/
kernel/sound/pci/aw2/aw2-alsa.c
+++ b/
kernel/sound/pci/aw2/aw2-alsa.c
@@
-258,8
+258,8
@@
static int snd_aw2_create(struct snd_card *card,
pci_set_master(pci);
/* check PCI availability (32bit DMA) */
pci_set_master(pci);
/* check PCI availability (32bit DMA) */
- 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, "Impossible to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
dev_err(card->dev, "Impossible to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;