1 files changed, 7 insertions, 9 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 66cad506b8a2..42103a0cdbc0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2838,7 +2838,7 @@ sub process {
                                 \+=|-=|\*=|\/=|%=|\^=|\|=|&=|
                                 =>|->|<<|>>|<|>|=|!|~|
                                 &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
-                                \?|:
+                                \?:|\?|:
                         }x;
                         my @elements = split(/($ops|;)/, $opline);
 
@@ -3061,15 +3061,13 @@ sub process {
                                                 $ok = 1;
                                         }
 
-                                        # Ignore ?:
-                                        if (($opv eq ':O' && $ca =~ /\?$/) ||
-                                            ($op eq '?' && $cc =~ /^:/)) {
-                                                $ok = 1;
-                                        }
-
+                                        # messages are ERROR, but ?: are CHK
                                         if ($ok == 0) {
-                                                if (ERROR("SPACING",
-                                                          "spaces required around that '$op' $at\n" . $hereptr)) {
+                                                my $msg_type = \&ERROR;
+                                                $msg_type = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
+
+                                                if (&{$msg_type}("SPACING",
+                                                                 "spaces required around that '$op' $at\n" . $hereptr)) {
                                                         $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
                                                         if (defined $fix_elements[$n + 2]) {
                                                                 $fix_elements[$n + 2] =~ s/^\s+//;