]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
aacraid: add missing curly braces
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Mar 2016 14:29:43 +0000 (15:29 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 27 Feb 2017 06:21:01 +0000 (22:21 -0800)
gcc-6 warns about obviously wrong indentation for newly added code in
aac_slave_configure():

drivers/scsi/aacraid/linit.c: In function 'aac_slave_configure':
drivers/scsi/aacraid/linit.c:458:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
   sdev->tagged_supported = 1;
   ^~~~
drivers/scsi/aacraid/linit.c:455:4: note: ...this 'else' clause, but it is not

gcc is correct, and evidently this was meant to be within the curly
braces that should have been there to start with. This patch adds them,
which avoids the warning and makes it clear what was intended here.

Nothing changes in behavior because in the 'if' block, the
sdev->tagged_supported flag is known to be set already.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 6bf3b630d0a7 ("aacraid: SCSI blk tag support")
Reviewed-by: Raghava Aditya Renukunta <raghavaaditya.renukunta@pmcs.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 548f0e65a38f36976260a63ff4acfa9f3b17307d)

Orabug: 25505509
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/scsi/aacraid/linit.c

index be08ed36f0486473c9cc291ef7be4b3e181af48c..b809341e38793d92795ddc45254a78985dfa62fb 100644 (file)
@@ -450,10 +450,11 @@ static int aac_slave_configure(struct scsi_device *sdev)
                else if (depth < 2)
                        depth = 2;
                scsi_change_queue_depth(sdev, depth);
-       } else
+       } else {
                scsi_change_queue_depth(sdev, 1);
 
                sdev->tagged_supported = 1;
+       }
 
        return 0;
 }