aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2011-05-23 18:29:13 -0400
committerJames Bottomley <jbottomley@parallels.com>2011-05-24 13:09:41 -0400
commit6e2037b0fd4d4ad9be941a3520d21945bc031a20 (patch)
treed301940c3d799ca53355e0e1ee379332a31a9943 /drivers/scsi
parenta061f57d662ac2b19a1ff1955349adce7a282a5d (diff)
[SCSI] osst: fix warning
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/osst.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 9b79e84f95bb..de0b1a704fb5 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -4698,11 +4698,12 @@ static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
4698 break; 4698 break;
4699 4699
4700 if ((SRpnt->sense[2] & 0x0f) == UNIT_ATTENTION) { 4700 if ((SRpnt->sense[2] & 0x0f) == UNIT_ATTENTION) {
4701 int j;
4702
4701 STp->pos_unknown = 0; 4703 STp->pos_unknown = 0;
4702 STp->partition = STp->new_partition = 0; 4704 STp->partition = STp->new_partition = 0;
4703 if (STp->can_partitions) 4705 if (STp->can_partitions)
4704 STp->nbr_partitions = 1; /* This guess will be updated later if necessary */ 4706 STp->nbr_partitions = 1; /* This guess will be updated later if necessary */
4705 int j;
4706 for (j = 0; j < ST_NBR_PARTITIONS; j++) { 4707 for (j = 0; j < ST_NBR_PARTITIONS; j++) {
4707 STps = &(STp->ps[j]); 4708 STps = &(STp->ps[j]);
4708 STps->rw = ST_IDLE; 4709 STps->rw = ST_IDLE;