Skip to content

Commit 382d62c

Browse files
stonezdmUlrich Hecht
authored andcommitted
media: TDA1997x: Remove redundant cancel_delayed_work in probe
commit 29de195ca39fc2ac0af6fd45522994df9f431f80 upstream. The delayed_work delayed_work_enable_hpd is initialized with INIT_DELAYED_WORK(), but it is never scheduled in tda1997x_probe(). 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 in tda1997x_probe() to avoid potential confusion. Fixes: 9ac0038 ("media: i2c: Add TDA1997x HDMI receiver driver") 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> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent bbefa60 commit 382d62c

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

drivers/media/i2c/tda1997x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2769,7 +2769,6 @@ static int tda1997x_probe(struct i2c_client *client,
27692769
err_free_handler:
27702770
v4l2_ctrl_handler_free(&state->hdl);
27712771
err_free_mutex:
2772-
cancel_delayed_work(&state->delayed_work_enable_hpd);
27732772
mutex_destroy(&state->page_lock);
27742773
mutex_destroy(&state->lock);
27752774
err_free_state:

0 commit comments

Comments
 (0)