From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 May 2011 22:29:13 +0000 (-0700)
Subject: [SCSI] osst: fix warning
X-Git-Tag: upstream/snapshot3+hdmi~10042^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e2037b0fd4d4ad9be941a3520d21945bc031a20;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[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>
---

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 9b79e84..de0b1a7 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)
 			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;