1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e53df2b086b2..55277a8e1527 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1678,6 +1678,8 @@ sub process {
         $linenr = 0;
         foreach my $line (@lines) {
                 $linenr++;
+                my $sline = $line;      #copy of $line
+                $sline =~ s/$;/ /g;     #with comments as spaces
 
                 my $rawline = $rawlines[$linenr - 1];
 
@@ -2194,7 +2196,7 @@ sub process {
                     $realline_next);
 #print "LINE<$line>\n";
                 if ($linenr >= $suppress_statement &&
-                    $realcnt && $line =~ /.\s*\S/) {
+                    $realcnt && $sline =~ /.\s*\S/) {
                         ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                 ctx_statement_block($linenr, $realcnt, 0);
                         $stat =~ s/\n./\n /g;