From 289651aa8c5e945b2c11ccec2bb2c31bf6456e57 Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Thu, 31 May 2012 16:26:09 -0700
Subject: [PATCH] --- yaml --- r: 309717 b: refs/heads/master c:
 9a4cad4e25b91f48494f13fce3d25ea44bec7472 h: refs/heads/master i:   309715:
 244fa4b5da8c8a211b3aa7ee03e202c1a522ef97 v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7aa9d596c7c1..bdf1a4ef0cc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 133fd9f5cda2d86904126f4b9fa4e8f4330c9569
+refs/heads/master: 9a4cad4e25b91f48494f13fce3d25ea44bec7472
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index faea0ec612bf..2262e1f57fa6 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2448,6 +2448,13 @@ sub process {
 				     "space prohibited between function name and open parenthesis '('\n" . $herecurr);
 			}
 		}
+
+# check for whitespace before a non-naked semicolon
+		if ($line =~ /^\+.*\S\s+;/) {
+			CHK("SPACING",
+			    "space prohibited before semicolon\n" . $herecurr);
+		}
+
 # Check operator spacing.
 		if (!($line=~/\#\s*include/)) {
 			my $ops = qr{