On Thu, Aug 31, 2023 at 06:34:21AM -0500, Mario Limonciello wrote: > 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> > --- > drivers/thunderbolt/tmu.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/thunderbolt/tmu.c b/drivers/thunderbolt/tmu.c > index d9544600b386..49146f97bb16 100644 > --- a/drivers/thunderbolt/tmu.c > +++ b/drivers/thunderbolt/tmu.c > @@ -416,6 +416,7 @@ int tb_switch_tmu_disable(struct tb_switch *sw) > * mode. > */ > ret = tb_switch_tmu_rate_write(sw, TB_SWITCH_TMU_RATE_OFF); > + if (ret) > return ret; > > tb_port_tmu_time_sync_disable(up); > -- > 2.34.1 > Thanks, now queued up. greg k-h