From 859e9d0699378d4b4762692291bdf6e581625ea1 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 21 Sep 2009 17:04:36 -0700
Subject: [PATCH] --- yaml --- r: 164530 b: refs/heads/master c:
 30dad6ebecffebddf6b9947d11e31377fa900ff3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 34efa4da5d5a..d62895d591a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 113f04a836481e9ecc26e8dee8b0e4d52878a288
+refs/heads/master: 30dad6ebecffebddf6b9947d11e31377fa900ff3
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index aa009a3b5b81..b6f267b72035 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1547,8 +1547,9 @@ sub process {
 				    $s =~ /^\s*#\s*?/ ||
 				    $s =~ /^\s*$Ident\s*:/) {
 					$continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
-					$s =~ s/^.*?\n//;
-					$cond_lines++;
+					if ($s =~ s/^.*?\n//) {
+						$cond_lines++;
+					}
 				}
 			}