diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-14 09:56:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-14 09:56:52 +0300 |
| commit | 25c43bf13b1657d9a2f6a2565e9159ce31517aa5 (patch) | |
| tree | c1fef736d3227dbd3788206c746d00763247f232 /scripts | |
| parent | a2f0fad32b0d0022c7e5706d333d74a9579f3742 (diff) | |
| parent | c8d17b451aa18b07b60e771addf17a5fdd4138c7 (diff) | |
| download | linux-25c43bf13b1657d9a2f6a2565e9159ce31517aa5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 89b1df4e72ab..c5ec977b9c37 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3169,12 +3169,12 @@ sub process { } # check for global initialisers. - if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/) { + if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) { if (ERROR("GLOBAL_INITIALISERS", "do not initialise globals to 0 or NULL\n" . $herecurr) && $fix) { - $fixed[$fixlinenr] =~ s/($Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/; + $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0|NULL|false)\s*;/$1;/; } } # check for static initialisers. |