From 21e10adf4652801ed00248057d81e543500d354f Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 9 Mar 2010 11:09:50 +0900
Subject: [PATCH] --- yaml --- r: 195541 b: refs/heads/master c:
 bb789d01620e5d36081b22edb6fb71cf55ff043c h: refs/heads/master i:   195539:
 29ca7a825e8f5b93260272a610d30702284a48ea v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 760b7f945fb1..639c88378117 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4de0cebc512148bee764bfdac7bf49555e41173
+refs/heads/master: bb789d01620e5d36081b22edb6fb71cf55ff043c
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index be171ed682e0..aa67b757bf23 100644
--- a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -988,7 +988,7 @@ _scsih_build_scatter_gather(struct MPT2SAS_ADAPTER *ioc,
 	u32 chain_offset;
 	u32 chain_length;
 	u32 chain_flags;
-	u32 sges_left;
+	int sges_left;
 	u32 sges_in_segment;
 	u32 sgl_flags;
 	u32 sgl_flags_last_element;
@@ -1009,7 +1009,7 @@ _scsih_build_scatter_gather(struct MPT2SAS_ADAPTER *ioc,
 
 	sg_scmd = scsi_sglist(scmd);
 	sges_left = scsi_dma_map(scmd);
-	if (!sges_left) {
+	if (sges_left < 0) {
 		sdev_printk(KERN_ERR, scmd->device, "pci_map_sg"
 		" failed: request for %d bytes!\n", scsi_bufflen(scmd));
 		return -ENOMEM;