1 files changed, 9 insertions, 8 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 66bcedc0c8b3..457f87460d6e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1363,14 +1363,6 @@ sub process {
                                 ERROR("switch and case should be at the same indent\n$hereline$err");
                         }
                 }
-                if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
-                    $line !~ /\G(?:
-                        (?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
-                        \s*return\s+
-                    )/xg)
-                {
-                        ERROR("trailing statements should be on next line\n" . $herecurr);
-                }
 
 # if/while/etc brace do not go on next line, unless defining a do while loop,
 # or if that brace on the next line is for something else
@@ -1986,6 +1978,15 @@ sub process {
                                 ERROR("trailing statements should be on next line\n" . $herecurr);
                         }
                 }
+# case and default should not have general statements after them
+                if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
+                    $line !~ /\G(?:
+                        (?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+                        \s*return\s+
+                    )/xg)
+                {
+                        ERROR("trailing statements should be on next line\n" . $herecurr);
+                }
 
                 # Check for }<nl>else {, these must be at the same
                 # indent level to be relevant to each other.