Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6e2037b0fd4d4ad9be941a3520d21945bc031a20

Authored by Andrew Morton
Committed by James Bottomley
1 parent a061f57d66
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -4698,11 +4698,12 @@
4698 4698 break;
4699 4699  
4700 4700 if ((SRpnt->sense[2] & 0x0f) == UNIT_ATTENTION) {
  4701 + int j;
  4702 +
4701 4703 STp->pos_unknown = 0;
4702 4704 STp->partition = STp->new_partition = 0;
4703 4705 if (STp->can_partitions)
4704 4706 STp->nbr_partitions = 1; /* This guess will be updated later if necessary */
4705   - int j;
4706 4707 for (j = 0; j < ST_NBR_PARTITIONS; j++) {
4707 4708 STps = &(STp->ps[j]);
4708 4709 STps->rw = ST_IDLE;