From 6c4d69746191c296d95b8a398ac28b5cc942ca3e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 23 Oct 2025 07:54:43 +0000 Subject: [PATCH] ANDROID: GKI: fix up build break where timer_delete_sync() was used We reverted the commit that renamed del_timer_sync() to timer_delete_sync() a long while back, but that breaks the build when new users of the call get merged into LTS releases. Fix the tc358743 driver by using the "old" name of the function. Fixes: 9205fb6e617a ("media: i2c: tc358743: Fix use-after-free bugs caused by orphan timer in probe") Change-Id: I56b1a69965937b3187978d0ae04d8c483916290f Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/tc358743.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c index 4ac84c0b7f8d..e9297a758fe1 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -2200,7 +2200,7 @@ static int tc358743_probe(struct i2c_client *client) err_work_queues: cec_unregister_adapter(state->cec_adap); if (!state->i2c_client->irq) { - timer_delete_sync(&state->timer); + del_timer_sync(&state->timer); flush_work(&state->work_i2c_poll); } cancel_delayed_work_sync(&state->delayed_work_enable_hotplug);