diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/pci.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index fdcf01af6762..b2d23d1b0d41 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -2305,15 +2305,13 @@ void pci_msi_off(struct pci_dev *dev) | |||
2305 | int | 2305 | int |
2306 | pci_set_dma_mask(struct pci_dev *dev, u64 mask) | 2306 | pci_set_dma_mask(struct pci_dev *dev, u64 mask) |
2307 | { | 2307 | { |
2308 | if (!pci_dma_supported(dev, mask)) | 2308 | int ret = dma_set_mask(&dev->dev, mask); |
2309 | return -EIO; | 2309 | if (ret) |
2310 | 2310 | return ret; | |
2311 | dev->dma_mask = mask; | ||
2312 | dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask)); | 2311 | dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask)); |
2313 | |||
2314 | return 0; | 2312 | return 0; |
2315 | } | 2313 | } |
2316 | 2314 | ||
2317 | int | 2315 | int |
2318 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | 2316 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) |
2319 | { | 2317 | { |