summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2012-01-10 15:10:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 16:30:51 -0800
commitc81769fdc84ed7c6eb3cc5cecb194324a5e4c8ad (patch)
treebfa7973e16263c7993a54bd53e7a00f350f7d5cc
parente01886ada28741d7cb2cfb3224e9caccfbc1a2d5 (diff)
downloadlinux-3.10-c81769fdc84ed7c6eb3cc5cecb194324a5e4c8ad.tar.gz
linux-3.10-c81769fdc84ed7c6eb3cc5cecb194324a5e4c8ad.tar.bz2
linux-3.10-c81769fdc84ed7c6eb3cc5cecb194324a5e4c8ad.zip
checkpatch: fix complex macros handling of square brackets
Signed-off-by: Andy Whitcroft <apw@canonical.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5e3f4191f95..ba7bcf34ad0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2815,7 +2815,7 @@ sub process {
# Flatten any parentheses and braces
while ($dstat =~ s/\([^\(\)]*\)/1/ ||
$dstat =~ s/\{[^\{\}]*\}/1/ ||
- $dstat =~ s/\[[^\{\}]*\]/1/)
+ $dstat =~ s/\[[^\[\]]*\]/1/)
{
}