From: Shuah Khan <shuah.khan@hp.com>
Date: Wed, 20 Feb 2013 17:24:34 +0000 (-0600)
Subject: [SCSI] hpsa: Check for dma_mapping_error in hpsa_map_one
X-Git-Tag: v3.9-rc1~21^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eceaae187d3bd457b3dba29c4f23bccda374db63;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

[SCSI] hpsa: Check for dma_mapping_error in hpsa_map_one

Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 4f33806..3b4d195 100644
--- a/drivers/scsi/hpsa.c
+++ b/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 =