OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[uclinux-h8/linux.git]
/
sound
/
pci
/
maestro3.c
diff --git
a/sound/pci/maestro3.c
b/sound/pci/maestro3.c
index
9be6609
..
72e89ce
100644
(file)
--- a/
sound/pci/maestro3.c
+++ b/
sound/pci/maestro3.c
@@
-2537,8
+2537,8
@@
snd_m3_create(struct snd_card *card, struct pci_dev *pci,
return -EIO;
/* check, if we can restrict PCI DMA transfers to 28 bits */
return -EIO;
/* check, if we can restrict PCI DMA transfers to 28 bits */
- if (
pci_set_dma_mask(pci
, DMA_BIT_MASK(28)) < 0 ||
-
pci_set_consistent_dma_mask(pci
, DMA_BIT_MASK(28)) < 0) {
+ if (
dma_set_mask(&pci->dev
, DMA_BIT_MASK(28)) < 0 ||
+
dma_set_coherent_mask(&pci->dev
, DMA_BIT_MASK(28)) < 0) {
dev_err(card->dev,
"architecture does not support 28bit PCI busmaster DMA\n");
pci_disable_device(pci);
dev_err(card->dev,
"architecture does not support 28bit PCI busmaster DMA\n");
pci_disable_device(pci);