summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorShuah Khan <shuah.khan@hp.com>2013-02-20 11:24:34 -0600
committerJames Bottomley <JBottomley@Parallels.com>2013-02-24 09:33:27 +0000
commiteceaae187d3bd457b3dba29c4f23bccda374db63 (patch)
tree0be03c17478119101ddf736b0924ba1dfa919fc0 /drivers/scsi
parent208afec4f3be8c51ad6eebe6611dd6d2ad2fa298 (diff)
downloadop-kernel-dev-eceaae187d3bd457b3dba29c4f23bccda374db63.zip
op-kernel-dev-eceaae187d3bd457b3dba29c4f23bccda374db63.tar.gz
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c5
1 files changed, 5 insertions, 0 deletions
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 =
OpenPOWER on IntegriCloud