---

yaml --- r: 360262 b: refs/heads/master c: eceaae1 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 11b07b2 · 11b07b2
1 parent 958a072
commit 11b07b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 208afec4f3be8c51ad6eebe6611dd6d2ad2fa298
+refs/heads/master: eceaae187d3bd457b3dba29c4f23bccda374db63
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
@@ -1405,6 +1405,11 @@ static void hpsa_map_one(struct pci_dev *pdev,
 	}
 
 	addr64 = (u64) pci_map_single(pdev, buf, buflen, data_direction);
+	if (dma_mapping_error(&pdev->dev, addr64)) {
+		cp->Header.SGList = 0;
+		cp->Header.SGTotal = 0;
+		return;
+	}
 	cp->SG[0].Addr.lower =
 	  (u32) (addr64 & (u64) 0x00000000FFFFFFFF);
 	cp->SG[0].Addr.upper =