This is a note to let you know that I've just added the patch titled thunderbolt: Fix a backport error for display flickering issue to the 6.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch and it can be found in the queue-6.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From mario.limonciello@xxxxxxx Thu Aug 31 14:29:42 2023 From: Mario Limonciello <mario.limonciello@xxxxxxx> Date: Thu, 31 Aug 2023 06:34:21 -0500 Subject: thunderbolt: Fix a backport error for display flickering issue To: <stable@xxxxxxxxxxxxxxx> Cc: Mario Limonciello <mario.limonciello@xxxxxxx>, <Joakim.Tjernlund@xxxxxxxxxxxx> Message-ID: <20230831113421.158244-1-mario.limonciello@xxxxxxx> From: Mario Limonciello <mario.limonciello@xxxxxxx> A mistake was made when backporting commit 583893a66d73 ("thunderbolt: Fix Thunderbolt 3 display flickering issue on 2nd hot plug onwards") in missing the `if` block. Add it back in. Reported-by: Joakim.Tjernlund@xxxxxxxxxxxx Closes: https://lore.kernel.org/stable/28b5d0accce90bedf2f75d65290c5a1302225f0f.camel@xxxxxxxxxxxx/ Fixes: 06614ca4f18e ("thunderbolt: Fix Thunderbolt 3 display flickering issue on 2nd hot plug onwards") Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/thunderbolt/tmu.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/thunderbolt/tmu.c +++ b/drivers/thunderbolt/tmu.c @@ -416,6 +416,7 @@ int tb_switch_tmu_disable(struct tb_swit * mode. */ ret = tb_switch_tmu_rate_write(sw, TB_SWITCH_TMU_RATE_OFF); + if (ret) return ret; tb_port_tmu_time_sync_disable(up); Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are queue-6.4/thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch queue-6.4/acpi-thermal-drop-nocrt-parameter.patch