diff --git a/[refs] b/[refs] index cbe5cfb7838a..9e6fd4a05222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 740504c61f79a932564fb7117d79ad53d950b201 +refs/heads/master: 3fef12d6cb832327a981b03326f8f07abebb51b7 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 862e8e0e86ae..ada27c44da02 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -2043,7 +2043,7 @@ sub process { # 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*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$| \s*return\s+ )/xg) {