summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-12 17:15:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-12 17:15:02 +0100
commit5f8e084026543bc06eb9b2a623de55bb4ab3e60e (patch)
treef4b67a3131e135d896b4f75f0f5795919650bc00
parent2eda61a850d45d421efcaaa06b64c06ee273d82e (diff)
parentc14556fc0c7c115ffb4a287560e1ec9f7869aac3 (diff)
downloadlinux-5f8e084026543bc06eb9b2a623de55bb4ab3e60e.tar.bz2
Merge tag 'thunderbolt-for-v5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fix for v5.11-rc4 This includes a single format string fix for the firmware connection manager USB4 NVM authentication proxy implementation introduced in this merge window. * tag 'thunderbolt-for-v5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Drop duplicated 0x prefix from format string
-rw-r--r--drivers/thunderbolt/icm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 8b7f941a9bb7..b8c4159bc32d 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -2316,7 +2316,7 @@ static int icm_usb4_switch_nvm_authenticate_status(struct tb_switch *sw,
if (auth && auth->reply.route_hi == sw->config.route_hi &&
auth->reply.route_lo == sw->config.route_lo) {
- tb_dbg(tb, "NVM_AUTH found for %llx flags 0x%#x status %#x\n",
+ tb_dbg(tb, "NVM_AUTH found for %llx flags %#x status %#x\n",
tb_route(sw), auth->reply.hdr.flags, auth->reply.status);
if (auth->reply.hdr.flags & ICM_FLAGS_ERROR)
ret = -EIO;