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>

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) {