1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 33740404cd9e..4b9569fa931b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3354,7 +3354,7 @@ sub process {
                 }
 
 # Check relative indent for conditionals and blocks.
-                if ($line =~ /\b(?:(?:if|while|for|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+                if ($line =~ /\b(?:(?:if|while|for|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|(?:do|else)\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
                         ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                 ctx_statement_block($linenr, $realcnt, 0)
                                         if (!defined $stat);
@@ -3446,6 +3446,8 @@ sub process {
                         if ($check && $s ne '' &&
                             (($sindent % 8) != 0 ||
                              ($sindent < $indent) ||
+                             ($sindent == $indent &&
+                              ($s !~ /^\s*(?:\}|\{|else\b)/)) ||
                              ($sindent > $indent + 8))) {
                                 WARN("SUSPECT_CODE_INDENT",
                                      "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");