projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into misc
[cascardo/linux.git]
/
drivers
/
ata
/
pdc_adma.c
diff --git
a/drivers/ata/pdc_adma.c
b/drivers/ata/pdc_adma.c
index
f10631b
..
64d682c
100644
(file)
--- a/
drivers/ata/pdc_adma.c
+++ b/
drivers/ata/pdc_adma.c
@@
-593,12
+593,12
@@
static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
{
int rc;
{
int rc;
- rc =
pci_set_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev, "32-bit consistent DMA enable failed\n");
return rc;
if (rc) {
dev_err(&pdev->dev, "32-bit consistent DMA enable failed\n");
return rc;