[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20250902011031.8519-1-duoming@zju.edu.cn>
Date: Tue, 2 Sep 2025 09:10:31 +0800
From: Duoming Zhou <duoming@....edu.cn>
To: linux-media@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
mchehab@...nel.org,
hverkuil@...nel.org,
Duoming Zhou <duoming@....edu.cn>
Subject: [PATCH] media: i2c: adv7842: Remove redundant cancel_delayed_work in probe
The delayed_work delayed_work_enable_hotplug is initialized with
INIT_DELAYED_WORK() in adv7842_probe(), but it is never scheduled
anywhere in the probe function.
Calling cancel_delayed_work() on a work that has never been
scheduled is redundant and unnecessary, as there is no pending
work to cancel.
Remove the redundant cancel_delayed_work() from error handling
path and adjust the goto label accordingly to simplify the code
and avoid potential confusion.
Fixes: a89bcd4c6c20 ("[media] adv7842: add new video decoder driver")
Signed-off-by: Duoming Zhou <duoming@....edu.cn>
---
drivers/media/i2c/adv7842.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 5545cd23e113..926840c964f7 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3626,7 +3626,7 @@ static int adv7842_probe(struct i2c_client *client)
err = media_entity_pads_init(&sd->entity, ADV7842_PAD_SOURCE + 1,
state->pads);
if (err)
- goto err_work_queues;
+ goto err_i2c;
err = adv7842_core_init(sd);
if (err)
@@ -3647,8 +3647,6 @@ static int adv7842_probe(struct i2c_client *client)
err_entity:
media_entity_cleanup(&sd->entity);
-err_work_queues:
- cancel_delayed_work(&state->delayed_work_enable_hotplug);
err_i2c:
adv7842_unregister_clients(sd);
err_hdl:
--
2.34.1
Powered by blists - more mailing lists