Commit 1092c412 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.10-rc3' of... 

Merge tag 'thunderbolt-for-v6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Fix for v6.10-rc3

This includes one USB4/Thunderbolt fix for v6.10-rc3:

  - Fix lane margining debugfs node creation condition.

This has been in linux-next with no reported issues.
parents 16637fea 985cfe50

drivers/thunderbolt/debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -943,8 +943,9 @@ static void margining_port_init(struct tb_port *port) 
	debugfs_create_file("run", 0600, dir, port, &margining_run_fops);

	debugfs_create_file("results", 0600, dir, port, &margining_results_fops);

	debugfs_create_file("test", 0600, dir, port, &margining_test_fops);

	if (independent_voltage_margins(usb4) ||

	    (supports_time(usb4) && independent_time_margins(usb4)))

	if (independent_voltage_margins(usb4) == USB4_MARGIN_CAP_0_VOLTAGE_HL ||

	    (supports_time(usb4) &&

	     independent_time_margins(usb4) == USB4_MARGIN_CAP_1_TIME_LR))

		debugfs_create_file("margin", 0600, dir, port, &margining_margin_fops);

}