From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Sat, 27 Aug 2005 02:09:20 +0000 (-0700)
Subject: [SCSI] qla2xxx: Remove redundant call to pci_unmap_sg().
X-Git-Tag: v2.6.14-rc1~522^2^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=131736d34ebc3251d79ddfd08a5e57a3e86decd4;p=linux-2.6-omap-h63xx.git

[SCSI] qla2xxx: Remove redundant call to pci_unmap_sg().

In a corner-case failure where the request-q does not
contain enough entries for a given request, pci_unmap_sg()
would be called twice.  Remove direct call and let the
failure-path logic handle the unmapping.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index ebdc3c54d15..37f82e2cd7f 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -810,12 +810,8 @@ qla24xx_start_scsi(srb_t *sp)
 			ha->req_q_cnt = ha->request_q_length -
 				(ha->req_ring_index - cnt);
 	}
-	if (ha->req_q_cnt < (req_cnt + 2)) {
-		if  (cmd->use_sg)
-			pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
-					cmd->sc_data_direction);
+	if (ha->req_q_cnt < (req_cnt + 2))
 		goto queuing_error;
-	}
 
 	/* Build command packet. */
 	ha->current_outstanding_cmd = handle;