From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD9B136BCD5; Tue, 6 Jan 2026 17:56:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767722179; cv=none; b=k2dYGEDL0cl9lN4DtSzlOBzOJjR0bDsFTGm077WKIZXAhPlD9r+m7pAhWJJgSE5JmSh+KTMGUzroGqnQrnmMcrPf8wE4QR0qXUfqLQhvKK5dcvyc53USWLn8KKzuHHMtTT6wpwih4hQNSLotKIcEzFKst/zysKhsZ8P++1SsZeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767722179; c=relaxed/simple; bh=qdxgyrFu+Que/TIXYkHm996CSZzyzYjo47KoIGwzvL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hnQZGhtOxDcPg+fWahYwyNxuPXbe7xYGOh4lve0hXvvTK8nBzxBnFYbEpZXN16LyTD22qLZYNWGOWhTjnMvFyHurHJXiWPAFIiXsCOnw+BsAjW25BTuzNm2K7xUoVNmty0yL/FwEDiItATco7sB5GcHn0DT5pKuMFLCg5eq3oqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qa30v1Yb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qa30v1Yb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A903C116C6; Tue, 6 Jan 2026 17:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767722179; bh=qdxgyrFu+Que/TIXYkHm996CSZzyzYjo47KoIGwzvL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qa30v1YbKu3E++PiqObjM54Co2RACQPpFpyeJTpw8OR5/dk4OO8oGhv41bio0fRbL f04HdhbOvatlLzfdrXGNr4JseizPz0aRZ7wxfi1p76K1nSYA8l/Acc5X4/cvudql74 1ZLvU7CI/V3wVztQvXa+WY8ACh6Mi0ESyTTESuvo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Duoming Zhou , Hans Verkuil Subject: [PATCH 6.18 188/312] media: i2c: adv7842: Remove redundant cancel_delayed_work in probe Date: Tue, 6 Jan 2026 18:04:22 +0100 Message-ID: <20260106170554.632703136@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170547.832845344@linuxfoundation.org> References: <20260106170547.832845344@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Duoming Zhou commit e66a5cc606c58e72f18f9cdd868a3672e918f9f8 upstream. 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") Cc: stable@vger.kernel.org Signed-off-by: Duoming Zhou Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/adv7842.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -3629,7 +3629,7 @@ static int adv7842_probe(struct i2c_clie 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) @@ -3650,8 +3650,6 @@ static int adv7842_probe(struct i2c_clie 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: