media: i2c: ADV7604: Remove redundant cancel_delayed_work in probe

commit 8f34f24355a607b98ecd9924837aab13c676eeca upstream.

The delayed_work delayed_work_enable_hotplug is initialized with
INIT_DELAYED_WORK() in adv76xx_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: 54450f591c99 ("[media] adv7604: driver for the Analog Devices ADV7604 video decoder")
Cc: stable@vger.kernel.org
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index aa4b1680121e25823031ad16087451d3d9f107ae..482e5234fc3896f6b4ef7bca4d046e14b14d630b 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3615,7 +3615,7 @@ static int adv76xx_probe(struct i2c_client *client,
        err = media_entity_pads_init(&sd->entity, state->source_pad + 1,
                                state->pads);
        if (err)
-               goto err_work_queues;
+               goto err_i2c;
 
        /* Configure regmaps */
        err = configure_regmaps(state);
@@ -3656,8 +3656,6 @@ static int adv76xx_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:
        adv76xx_unregister_clients(state);
 err_hdl: