drivers/message: move dereference after NULL test

If the NULL test on dev->i2o_dev or i2o_dev is needed, then the dereference
should be after the NULL test.

A simplified version of the semantic match that detects this problem is as
follows (http://coccinelle.lip6.fr/):

// <smpl>
@match exists@
expression x, E;
identifier fld;
@@

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Kashyap Desai <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index e6733bc99724bb1b335ef213c915e8ff7c6023f5..f0f1e667000f30b8769587d9036a36b4b4c3b715 100644 (file)
--- a/drivers/message/i2o/i2o_block.c
+++ b/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/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 3d45817e6dcda66c3f132ac024c4ede18f919cc6..ea6b2197da8a2fc38afd18aaebd3d0a32338a993 100644 (file)
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/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);