Commit 1f948b88 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/p2pdma' 

- Apply bus offset correctly in DMA address calculation, which used the
  wrong sign before (Wang Lu)

* pci/p2pdma:
  PCI/P2PDMA: Apply bus offset correctly in DMA address calculation
parents efe68563 3a194079

drivers/pci/p2pdma.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static int __pci_p2pdma_map_sg(struct pci_p2pdma_pagemap *p2p_pgmap, 
	int i;



	for_each_sg(sg, s, nents, i) {

		s->dma_address = sg_phys(s) - p2p_pgmap->bus_offset;

		s->dma_address = sg_phys(s) + p2p_pgmap->bus_offset;

		sg_dma_len(s) = s->length;

	}