Skip to content

Commit f48585c

Browse files
committed
Merge tag 'thunderbolt-for-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fixes for v6.5-rc6 This includes two fixes for v6.5-rc6: - Correct display flickering when connecting a Thunderbolt 3 device to an AMD USB4 host controller - Fix a memory leak in bandwidth allocation request. Both have been in linux-next with no reported issues. * tag 'thunderbolt-for-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Fix memory leak in tb_handle_dp_bandwidth_request() thunderbolt: Fix Thunderbolt 3 display flickering issue on 2nd hot plug onwards
2 parents 3ddaa6a + 596a512 commit f48585c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

drivers/thunderbolt/tb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1964,6 +1964,8 @@ static void tb_handle_dp_bandwidth_request(struct work_struct *work)
19641964

19651965
pm_runtime_mark_last_busy(&tb->dev);
19661966
pm_runtime_put_autosuspend(&tb->dev);
1967+
1968+
kfree(ev);
19671969
}
19681970

19691971
static void tb_queue_dp_bandwidth_request(struct tb *tb, u64 route, u8 port)

drivers/thunderbolt/tmu.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,9 @@ int tb_switch_tmu_disable(struct tb_switch *sw)
579579
* uni-directional mode and we don't want to change it's TMU
580580
* mode.
581581
*/
582-
tb_switch_tmu_rate_write(sw, tmu_rates[TB_SWITCH_TMU_MODE_OFF]);
582+
ret = tb_switch_tmu_rate_write(sw, tmu_rates[TB_SWITCH_TMU_MODE_OFF]);
583+
if (ret)
584+
return ret;
583585

584586
tb_port_tmu_time_sync_disable(up);
585587
ret = tb_port_tmu_time_sync_disable(down);

0 commit comments

Comments
 (0)