From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 6 Dec 2007 15:48:12 +0000 (+0000)
Subject: linux/x86: dma_map_sg(): BUG_ON() before use
X-Git-Tag: xen-3.2.0~21^2^2~28^2^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1bb734f1130a0305709b7f92bc45345a59ab4a2c;p=xenclient%2Fkernel.git

linux/x86: dma_map_sg(): BUG_ON() before use
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/arch/i386/kernel/pci-dma-xen.c b/arch/i386/kernel/pci-dma-xen.c
index 7fe2e6dd..9c8b6435 100644
--- a/arch/i386/kernel/pci-dma-xen.c
+++ b/arch/i386/kernel/pci-dma-xen.c
@@ -91,10 +91,10 @@ dma_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,
 		rc = swiotlb_map_sg(hwdev, sg, nents, direction);
 	} else {
 		for (i = 0; i < nents; i++ ) {
+			BUG_ON(!sg[i].page);
 			sg[i].dma_address =
 				gnttab_dma_map_page(sg[i].page) + sg[i].offset;
 			sg[i].dma_length  = sg[i].length;
-			BUG_ON(!sg[i].page);
 			IOMMU_BUG_ON(address_needs_mapping(
 				hwdev, sg[i].dma_address));
 			IOMMU_BUG_ON(range_straddles_page_boundary(