aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b43e309c38ff..1eca1e143581 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1234,7 +1234,6 @@ sub process {
1234 $linenr++; 1234 $linenr++;
1235 1235
1236 my $rawline = $rawlines[$linenr - 1]; 1236 my $rawline = $rawlines[$linenr - 1];
1237 my $hunk_line = ($realcnt != 0);
1238 1237
1239#extract the line range in the file after the patch is applied 1238#extract the line range in the file after the patch is applied
1240 if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { 1239 if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
@@ -1274,6 +1273,8 @@ sub process {
1274 $realcnt--; 1273 $realcnt--;
1275 } 1274 }
1276 1275
1276 my $hunk_line = ($realcnt != 0);
1277
1277#make up the handle for any error we report on this line 1278#make up the handle for any error we report on this line
1278 $prefix = "$filename:$realline: " if ($emacs && $file); 1279 $prefix = "$filename:$realline: " if ($emacs && $file);
1279 $prefix = "$filename:$linenr: " if ($emacs && !$file); 1280 $prefix = "$filename:$linenr: " if ($emacs && !$file);