Commit 5f8e0840 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.11-rc4' of... 

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
parents 2eda61a8 c14556fc

drivers/thunderbolt/icm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;