projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'spi-v4.1-rc1' into spi-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ide
/
setup-pci.c
diff --git
a/drivers/ide/setup-pci.c
b/drivers/ide/setup-pci.c
index 34a5e5223d5004010a03ae4e468e1a2a05e871ba..112d2fe1bcdbc8b3acb45d613901afa06798d556 100644
(file)
--- a/
drivers/ide/setup-pci.c
+++ b/
drivers/ide/setup-pci.c
@@
-209,7
+209,7
@@
static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
* a DMA mask field to the struct ide_port_info if we need it
* (or let lower level driver set the DMA mask)
*/
* a DMA mask field to the struct ide_port_info if we need it
* (or let lower level driver set the DMA mask)
*/
- ret =
pci_set_dma_mask(
dev, DMA_BIT_MASK(32));
+ ret =
dma_set_mask(&dev->
dev, DMA_BIT_MASK(32));
if (ret < 0) {
printk(KERN_ERR "%s %s: can't set DMA mask\n",
d->name, pci_name(dev));
if (ret < 0) {
printk(KERN_ERR "%s %s: can't set DMA mask\n",
d->name, pci_name(dev));