[SCSI] osst: fix warning
authorAndrew Morton <akpm@linux-foundation.org>
Mon, 23 May 2011 22:29:13 +0000 (15:29 -0700)
committerJames Bottomley <jbottomley@parallels.com>
Tue, 24 May 2011 17:09:41 +0000 (13:09 -0400)
drivers/scsi/osst.c: In function '__os_scsi_tape_open':
drivers/scsi/osst.c:4705: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <jbottomley@parallels.com>
drivers/scsi/osst.c

index 9b79e84..de0b1a7 100644 (file)
@@ -4698,11 +4698,12 @@ static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
                        break;
 
                        if ((SRpnt->sense[2] & 0x0f) == UNIT_ATTENTION) {
+                               int j;
+
                                STp->pos_unknown = 0;
                                STp->partition = STp->new_partition = 0;
                                if (STp->can_partitions)
                                        STp->nbr_partitions = 1;  /* This guess will be updated later if necessary */
-                               int j;
                                for (j = 0; j < ST_NBR_PARTITIONS; j++) {
                                        STps = &(STp->ps[j]);
                                        STps->rw = ST_IDLE;