From 85a65edb69df8607e066708c7fdf47f874bf83ed Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 10 Aug 2010 18:01:14 -0700
Subject: [PATCH] --- yaml --- r: 208399 b: refs/heads/master c:
 d23670069ad60c82234e51a945e8b472e8c7bde2 h: refs/heads/master i:   208397:
 8f12b9d050a004f78863cfe52193d5849f54c89c   208395:
 73487b4c79262a43355c8c3d3e62208a5430160f   208391:
 e3f3a9cfaeef2f246e2e667ce75b41a2077e4d20   208383:
 1622465fa44717400f58c49909e6e38008e03648 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/message/i2o/i2o_block.c | 3 ++-
 trunk/drivers/message/i2o/i2o_scsi.c  | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a4fd14f07bf0..877d6ed76d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95cc7baa7f19e191b4790d144b7cbe47369cfe32
+refs/heads/master: d23670069ad60c82234e51a945e8b472e8c7bde2
diff --git a/trunk/drivers/message/i2o/i2o_block.c b/trunk/drivers/message/i2o/i2o_block.c
index e6733bc99724..f0f1e667000f 100644
--- a/trunk/drivers/message/i2o/i2o_block.c
+++ b/trunk/drivers/message/i2o/i2o_block.c
@@ -727,7 +727,7 @@ static int i2o_block_transfer(struct request *req)
 {
 	struct i2o_block_device *dev = req->rq_disk->private_data;
 	struct i2o_controller *c;
-	u32 tid = dev->i2o_dev->lct_data.tid;
+	u32 tid;
 	struct i2o_message *msg;
 	u32 *mptr;
 	struct i2o_block_request *ireq = req->special;
@@ -743,6 +743,7 @@ static int i2o_block_transfer(struct request *req)
 		goto exit;
 	}
 
+	tid = dev->i2o_dev->lct_data.tid;
 	c = dev->i2o_dev->iop;
 
 	msg = i2o_msg_get(c);
diff --git a/trunk/drivers/message/i2o/i2o_scsi.c b/trunk/drivers/message/i2o/i2o_scsi.c
index 3d45817e6dcd..ea6b2197da8a 100644
--- a/trunk/drivers/message/i2o/i2o_scsi.c
+++ b/trunk/drivers/message/i2o/i2o_scsi.c
@@ -528,7 +528,6 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
 	 *      Do the incoming paperwork
 	 */
 	i2o_dev = SCpnt->device->hostdata;
-	c = i2o_dev->iop;
 
 	SCpnt->scsi_done = done;
 
@@ -538,7 +537,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
 		done(SCpnt);
 		goto exit;
 	}
-
+	c = i2o_dev->iop;
 	tid = i2o_dev->lct_data.tid;
 
 	osm_debug("qcmd: Tid = %03x\n", tid);