diff options
| author | Joe Perches <joe@perches.com> | 2015-09-09 15:37:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 13:29:01 -0700 |
| commit | 7d3a9f673e1bdb45f86d15a67e230e4a9b050850 (patch) | |
| tree | a4893fb6092cc84ca97eebb4ef12249b22ab37d1 /scripts | |
| parent | 100425deeb7586c9d401f787aeab3b43a4c6a0c6 (diff) | |
| download | linux-7d3a9f673e1bdb45f86d15a67e230e4a9b050850.tar.gz linux-7d3a9f673e1bdb45f86d15a67e230e4a9b050850.tar.bz2 linux-7d3a9f673e1bdb45f86d15a67e230e4a9b050850.zip | |
checkpatch: report the right line # when using --emacs and --file
commit 34d8815f9512 ("checkpatch: add --showfile to allow input via pipe
to show filenames") broke the --emacs with --file option.
Fix it.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 780c91d82aa9..ea28336ea2a5 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2166,7 +2166,11 @@ sub process { if ($showfile) { $prefix = "$realfile:$realline: " } elsif ($emacs) { - $prefix = "$filename:$linenr: "; + if ($file) { + $prefix = "$filename:$realline: "; + } else { + $prefix = "$filename:$linenr: "; + } } if ($found_file) { |