1 files changed, 5 insertions, 1 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 74bba23a8df0..52a223ebcd10 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2641,10 +2641,14 @@ sub process {
                 next if ($realfile !~ /\.(h|c)$/);
 
 # check indentation of any line with a bare else
+# (but not if it is a multiple line "if (foo) return bar; else return baz;")
 # if the previous line is a break or return and is indented 1 tab more...
                 if ($sline =~ /^\+([\t]+)(?:}[ \t]*)?else(?:[ \t]*{)?\s*$/) {
                         my $tabs = length($1) + 1;
-                        if ($prevline =~ /^\+\t{$tabs,$tabs}(?:break|return)\b/) {
+                        if ($prevline =~ /^\+\t{$tabs,$tabs}break\b/ ||
+                            ($prevline =~ /^\+\t{$tabs,$tabs}return\b/ &&
+                             defined $lines[$linenr] &&
+                             $lines[$linenr] !~ /^[ \+]\t{$tabs,$tabs}return/)) {
                                 WARN("UNNECESSARY_ELSE",
                                      "else is not generally useful after a break or return\n" . $hereprev);
                         }