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

Merge tag 'thunderbolt-for-v6.5-rc6' of... 

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
parents 3ddaa6a2 596a5123

drivers/thunderbolt/tb.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

drivers/thunderbolt/tmu.c

+3 −1
Original line number Diff line number Diff line
@@ -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);