Skip to content

Commit

Permalink
Merge tag 'thunderbolt-for-v6.5-rc6' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
gregkh committed Aug 8, 2023
2 parents 3ddaa6a + 596a512 commit f48585c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/thunderbolt/tb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1964,6 +1964,8 @@ static void tb_handle_dp_bandwidth_request(struct work_struct *work)

pm_runtime_mark_last_busy(&tb->dev);
pm_runtime_put_autosuspend(&tb->dev);

kfree(ev);
}

static void tb_queue_dp_bandwidth_request(struct tb *tb, u64 route, u8 port)
Expand Down
4 changes: 3 additions & 1 deletion drivers/thunderbolt/tmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,9 @@ int tb_switch_tmu_disable(struct tb_switch *sw)
* uni-directional mode and we don't want to change it's TMU
* mode.
*/
tb_switch_tmu_rate_write(sw, tmu_rates[TB_SWITCH_TMU_MODE_OFF]);
ret = tb_switch_tmu_rate_write(sw, tmu_rates[TB_SWITCH_TMU_MODE_OFF]);
if (ret)
return ret;

tb_port_tmu_time_sync_disable(up);
ret = tb_port_tmu_time_sync_disable(down);
Expand Down

0 comments on commit f48585c

Please sign in to comment.