From 7f2bbd3583f8c86409992cb9eafff49d80d76adc Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Tue, 26 Oct 2010 14:23:12 -0700
Subject: [PATCH] --- yaml --- r: 217584 b: refs/heads/master c:
 fb2d2c1b5825503d30fb6f2dc328dbe4a47d9794 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3514fa0debcc..779a5c7316d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2c0a23514d8ac4ed10a8e742467cfb72ca3bed8
+refs/heads/master: fb2d2c1b5825503d30fb6f2dc328dbe4a47d9794
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 32d6a236570d..8d010ac0efe1 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2183,15 +2183,16 @@ sub process {
 			my $value = $2;
 
 			# Flatten any parentheses
-			$value =~ s/\)\(/\) \(/g;
+			$value =~ s/\(/ \(/g;
+			$value =~ s/\)/\) /g;
 			while ($value =~ s/\[[^\{\}]*\]/1/ ||
 			       $value !~ /(?:$Ident|-?$Constant)\s*
 					     $Compare\s*
 					     (?:$Ident|-?$Constant)/x &&
 			       $value =~ s/\([^\(\)]*\)/1/) {
 			}
-
-			if ($value =~ /^(?:$Ident|-?$Constant)$/) {
+#print "value<$value>\n";
+			if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) {
 				ERROR("return is not a function, parentheses are not required\n" . $herecurr);
 
 			} elsif ($spacing !~ /\s+/) {