From: Bob Picco <bob.picco@oracle.com>
Date: Tue, 31 Jan 2012 19:45:51 +0000 (-0500)
Subject: Revert "bnx2fc: scsi_dma_unmap() not invoked on IO completions"
X-Git-Tag: v2.6.39-400.9.0~615^2~74
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=357e2ed16b998067f7ae7cd0a192ae201494197a;p=users%2Fjedix%2Flinux-maple.git

Revert "bnx2fc: scsi_dma_unmap() not invoked on IO completions"

This reverts commit e70f61eb1c6ac5048edfd214a72e10c434127931.
---

diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 454c72cdafbc..b5b5c346d779 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1734,6 +1734,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,
 		printk(KERN_ERR PFX "SCp.ptr is NULL\n");
 		return;
 	}
+	io_req->sc_cmd = NULL;
 
 	if (io_req->on_active_queue) {
 		list_del_init(&io_req->link);
@@ -1753,7 +1754,6 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,
 	}
 
 	bnx2fc_unmap_sg_list(io_req);
-	io_req->sc_cmd = NULL;
 
 	switch (io_req->fcp_status) {
 	case FC_GOOD: