diff --git a/[refs] b/[refs] index 807817aeefd3..27cd0b93f0a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 +refs/heads/master: e3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index fdcf01af6762..b2d23d1b0d41 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -2305,15 +2305,13 @@ void pci_msi_off(struct pci_dev *dev) int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { - if (!pci_dma_supported(dev, mask)) - return -EIO; - - dev->dma_mask = mask; + int ret = dma_set_mask(&dev->dev, mask); + if (ret) + return ret; dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask)); - return 0; } - + int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) {