checkpatch: fix up comment checks search to scan the entire block

We are not counting the lines in the block correctly which causes the
comment scan to stop prematurly and thus miss comments which end at the
end of the block.  Fix this up.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 586f9a4f0ad0..482768cd5790 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1029,9 +1029,14 @@ sub process {
                         # edge is a close comment then we must be in a comment
                         # at context start.
                         my $edge;
-                        for (my $ln = $linenr + 1; $ln < ($linenr + $realcnt); $ln++) {
-                                next if ($line =~ /^-/);
-                                ($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
+                        my $cnt = $realcnt;
+                        for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
+                                next if (defined $rawlines[$ln - 1] &&
+                                         $rawlines[$ln - 1] =~ /^-/);
+                                $cnt--;
+                                #print "RAW<$rawlines[$ln - 1]>\n";
+                                ($edge) = (defined $rawlines[$ln - 1] &&
+                                        $rawlines[$ln - 1] =~ m@(/\*|\*/)@);
                                 last if (defined $edge);
                         }
                         if (defined $edge && $edge eq '*/') {