From 4bda607ee5366eebb4dd73c55b7eb298229b85fa Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Tue, 26 Oct 2010 14:23:18 -0700
Subject: [PATCH] --- yaml --- r: 217593 b: refs/heads/master c:
 5eaa20b984eb316533b4a098d8de3912e434df6a h: refs/heads/master i:   217591:
 9ea19db54b92271dbb753e9774d35596e2453114 v: v3

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

diff --git a/[refs] b/[refs]
index 1934abea44fa..0533a3b4833a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 015830be9779aeae7de7060b07a3157a8e41bcb4
+refs/heads/master: 5eaa20b984eb316533b4a098d8de3912e434df6a
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 53b2eaecba0c..d5361e49abad 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2476,8 +2476,8 @@ sub process {
 				\.$Ident\s*=\s*|
 				^\"|\"$
 			}x;
-			#print "REST<$rest> dstat<$dstat>\n";
-			if ($rest ne '') {
+			#print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
+			if ($rest ne '' && $rest ne ',') {
 				if ($rest !~ /while\s*\(/ &&
 				    $dstat !~ /$exceptions/)
 				{