Skip to content

Commit 1092c41

Browse files
committed
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.
2 parents 16637fe + 985cfe5 commit 1092c41

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/thunderbolt/debugfs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,9 @@ static void margining_port_init(struct tb_port *port)
943943
debugfs_create_file("run", 0600, dir, port, &margining_run_fops);
944944
debugfs_create_file("results", 0600, dir, port, &margining_results_fops);
945945
debugfs_create_file("test", 0600, dir, port, &margining_test_fops);
946-
if (independent_voltage_margins(usb4) ||
947-
(supports_time(usb4) && independent_time_margins(usb4)))
946+
if (independent_voltage_margins(usb4) == USB4_MARGIN_CAP_0_VOLTAGE_HL ||
947+
(supports_time(usb4) &&
948+
independent_time_margins(usb4) == USB4_MARGIN_CAP_1_TIME_LR))
948949
debugfs_create_file("margin", 0600, dir, port, &margining_margin_fops);
949950
}
950951

0 commit comments

Comments
 (0)