Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[cascardo/linux.git] / drivers / message / i2o / i2o_scsi.c

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 1bcdbbb..ea6b219 100644 (file)
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -390,7 +390,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m,
  *     @i2o_dev: the I2O device which was added
  *
  *     If a I2O device is added we catch the notification, because I2O classes
- *     other then SCSI peripheral will not be received through
+ *     other than SCSI peripheral will not be received through
  *     i2o_scsi_probe().
  */
 static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev)
@@ -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);