From 6b8465939a500d9c67660ef8401de03a79689ba9 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 26 Oct 2009 16:50:13 -0700
Subject: [PATCH] --- yaml --- r: 167762 b: refs/heads/master c:
 cc77cdca5209c1199deb33f3a83df191ac32f4d6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d82fb0e670d6..f078fc1a6f1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a974fdbe3fbb4b0f6d552579dc79ac237412c61
+refs/heads/master: cc77cdca5209c1199deb33f3a83df191ac32f4d6
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index b43e309c38ff..1eca1e143581 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1234,7 +1234,6 @@ sub process {
 		$linenr++;
 
 		my $rawline = $rawlines[$linenr - 1];
-		my $hunk_line = ($realcnt != 0);
 
 #extract the line range in the file after the patch is applied
 		if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
@@ -1274,6 +1273,8 @@ sub process {
 			$realcnt--;
 		}
 
+		my $hunk_line = ($realcnt != 0);
+
 #make up the handle for any error we report on this line
 		$prefix = "$filename:$realline: " if ($emacs && $file);
 		$prefix = "$filename:$linenr: " if ($emacs && !$file);