diff --git a/[refs] b/[refs]
index 146f6b4214fd..a98b180ace99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ceb532b04b7a3b8f534d11a6e839f8b8bff94c1
+refs/heads/master: 99423c2065b62fee41cdbd8da7e63bf1f8f9e9b0
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index cb2dac37aaff..ba105a848396 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1669,8 +1669,8 @@ sub process {
 		}
 
 # check for initialisation to aggregates open brace on the next line
-		if ($prevline =~ /$Declare\s*$Ident\s*=\s*$/ &&
-		    $line =~ /^.\s*{/) {
+		if ($line =~ /^.\s*{/ &&
+		    $prevline =~ /(?:^|[^=])=\s*$/) {
 			ERROR("that open brace { should be on the previous line\n" . $hereprev);
 		}