1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 41ecae81de99..d98ffdd2180f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4816,16 +4816,20 @@ sub process {
                              "Consecutive strings are generally better as a single string\n" . $herecurr);
                 }
 
-# check for %L{u,d,i} in strings
+# check for %L{u,d,i} and 0x%[udi] in strings
                 my $string;
                 while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
                         $string = substr($rawline, $-[1], $+[1] - $-[1]);
                         $string =~ s/%%/__/g;
-                        if ($string =~ /(?<!%)%L[udi]/) {
+                        if ($string =~ /(?<!%)%[\*\d\.\$]*L[udi]/) {
                                 WARN("PRINTF_L",
                                      "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
                                 last;
                         }
+                        if ($string =~ /0x%[\*\d\.\$\Llzth]*[udi]/) {
+                                ERROR("PRINTF_0xDECIMAL",
+                                      "Prefixing 0x with decimal output is defective\n" . $herecurr);
+                        }
                 }
 
 # check for line continuations in quoted strings with odd counts of "