From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Sat, 24 Dec 2011 06:44:16 +0000 (-0800)
Subject: qla2xxx: Reference proper scsi_qla_host structure for processing non-scsi SRB commands.
X-Git-Tag: v2.6.39-400.9.0~423^2~78
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a8fb57e46c007e81fc7bc3ca85b8f28b6b0611e8;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Reference proper scsi_qla_host structure for processing non-scsi SRB commands.

JIRA Key: V2632FC-137
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 6e13cc25bc97..0d2dc41925e3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -125,9 +125,9 @@ qla2x00_async_login_sp_done(void *data, void *ptr, int res)
 	struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
 
 	if (!test_bit(UNLOADING, &vha->dpc_flags))
-		qla2x00_post_async_login_done_work(vha, sp->fcport,
+		qla2x00_post_async_login_done_work(sp->fcport->vha, sp->fcport,
 		    lio->u.logio.data);
-	sp->free(vha, sp);
+	sp->free(sp->fcport->vha, sp);
 }
 
 int
@@ -164,7 +164,7 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,
 	return rval;
 
 done_free_sp:
-	sp->free(vha, sp);
+	sp->free(fcport->vha, sp);
 done:
 	return rval;
 }
@@ -177,9 +177,9 @@ qla2x00_async_logout_sp_done(void *data, void *ptr, int res)
 	struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
 
 	if (!test_bit(UNLOADING, &vha->dpc_flags))
-		qla2x00_post_async_logout_done_work(vha, sp->fcport,
+		qla2x00_post_async_logout_done_work(sp->fcport->vha, sp->fcport,
 		    lio->u.logio.data);
-	sp->free(vha, sp);
+	sp->free(sp->fcport->vha, sp);
 }
 
 int
@@ -212,7 +212,7 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport)
 	return rval;
 
 done_free_sp:
-	sp->free(vha, sp);
+	sp->free(fcport->vha, sp);
 done:
 	return rval;
 }
@@ -225,9 +225,9 @@ qla2x00_async_adisc_sp_done(void *data, void *ptr, int res)
 	struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
 
 	if (!test_bit(UNLOADING, &vha->dpc_flags))
-		qla2x00_post_async_adisc_done_work(vha, sp->fcport,
+		qla2x00_post_async_adisc_done_work(sp->fcport->vha, sp->fcport,
 		    lio->u.logio.data);
-	sp->free(vha, sp);
+	sp->free(sp->fcport->vha, sp);
 }
 
 int
@@ -262,7 +262,7 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport,
 	return rval;
 
 done_free_sp:
-	sp->free(vha, sp);
+	sp->free(fcport->vha, sp);
 done:
 	return rval;
 }
@@ -291,7 +291,7 @@ qla2x00_async_tm_cmd_done(void *data, void *ptr, int res)
 			    "TM IOCB failed (%x).\n", rval);
 		}
 	}
-	sp->free(vha, sp);
+	sp->free(sp->fcport->vha, sp);
 }
 
 int
@@ -330,7 +330,7 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t tm_flags, uint32_t lun,
 	return rval;
 
 done_free_sp:
-	sp->free(vha, sp);
+	sp->free(fcport->vha, sp);
 done:
 	return rval;
 }