Merge branch 'akpm-current/current'

[deliverable/linux.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 8dcf5a960951805b09d650b2cc243ceaeff6a5bb..4a7e8d306174e46bdcbe98b1a4f9d4dc589e970f 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -503,7 +503,8 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
                goto out;
 
        ret = BLK_MQ_RQ_QUEUE_BUSY;
-       if (!dma_map_sg(dev->dev, iod->sg, iod->nents, dma_dir))
+       if (!dma_map_sg_attrs(dev->dev, iod->sg, iod->nents, dma_dir,
+                               DMA_ATTR_NO_WARN))
                goto out;
 
        if (!nvme_setup_prps(dev, req, size))