diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-07 21:08:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-07 21:08:20 +0200 |
| commit | 1092c4126bf8fa57d7298724d9894ba3b1c07f86 (patch) | |
| tree | b6cce35882ff3da19a77198bf5161e1e4fcaf294 | |
| parent | usb-storage: alauda: Check whether the media is initialized (diff) | |
| parent | thunderbolt: debugfs: Fix margin debugfs node creation condition (diff) | |
| download | wireguard-linux-1092c4126bf8fa57d7298724d9894ba3b1c07f86.tar.xz wireguard-linux-1092c4126bf8fa57d7298724d9894ba3b1c07f86.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | drivers/thunderbolt/debugfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/thunderbolt/debugfs.c b/drivers/thunderbolt/debugfs.c index 193e9dfc983b..70b52aac3d97 100644 --- a/drivers/thunderbolt/debugfs.c +++ b/drivers/thunderbolt/debugfs.c @@ -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); } |