From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6B5E135C6B1; Tue, 21 Jul 2026 21:20:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668859; cv=none; b=XgZnRPB/wq4x2DmmDjV7Rvo7EkgEcS9Yiig4RkKF8U1up5ANqRV2efybKxcZRQ627ArqJhk+TfBH5of8AQXqp86eiwLuPkF+sjz+u6Pfy3Icg6+e8RJc2dZ7jaqEIganz9U7NcSEK72zZr/UIjsROWN2Tyn7P+SXHe18n5BSEWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668859; c=relaxed/simple; bh=4/MG7W/fi7i7pNcCfhoLdAorTQTZK4IF3eb7O5hJtC4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BadEWvgTj24sc5oAJE64GM33s7f0WwKskPcDQPYLDyRksD8yie3CeptacoeOYadCPmbe6QhO7uAMi6QUPXSMOCxOpCO9K/Iui+ie+jBFTupMPIB5DQf3ORvT2SvU10datgLtTVXhg1bLWcKjVW1Q0c1Ob9k3U9EyIwJv0WuEZs0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LzSiVGkb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LzSiVGkb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7AFE1F00A3A; Tue, 21 Jul 2026 21:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668858; bh=Bm48Ct0sIVix/+CTb7pCnPgIEZqMqZ95VDvvLc5WpG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LzSiVGkbnxpzrjYJbLomCbKjIEPOewNWm87n22lUpWLZg5s0O/3L/eDFb3dpOIdtf iieudZRChRCsB6WAtqvjYqMZEsn0cBdotn3wuQIysMYzUiVpcIBDqgXsHQ0u34v3lK IEBd5PKXQ9zg2AyUqMp3A3vHh29R6Nzofzk80SEk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Gu , Guenter Roeck , Baolin Wang , Sasha Levin Subject: [PATCH 6.1 0292/1067] watchdog: sprd_wdt: Remove redundant sprd_wdt_disable() on register failure Date: Tue, 21 Jul 2026 17:14:53 +0200 Message-ID: <20260721152431.135068208@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Gu [ Upstream commit 96b3cfc3b8ad0524d12fed1e08bc5df3ff345f64 ] The driver uses devm_add_action_or_reset() to register sprd_wdt_disable() as a managed cleanup action. When devm_watchdog_register_device() fails, the devm core will invoke the cleanup action automatically. The explicit sprd_wdt_disable() call in the error path is therefore redundant and results in adouble cleanup. Fixes: 78d9bfad2e89 ("watchdog: sprd_wdt: Convert to use device managed functions and other improvements") Signed-off-by: Felix Gu Reviewed-by: Guenter Roeck Reviewed-by: Baolin Wang Link: https://lore.kernel.org/r/20260223-sprd_wdt-v1-1-2e71f9a76ecb@gmail.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/watchdog/sprd_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c index 4e689b6ff1418c..aacf04616fefe2 100644 --- a/drivers/watchdog/sprd_wdt.c +++ b/drivers/watchdog/sprd_wdt.c @@ -320,10 +320,9 @@ static int sprd_wdt_probe(struct platform_device *pdev) watchdog_init_timeout(&wdt->wdd, 0, dev); ret = devm_watchdog_register_device(dev, &wdt->wdd); - if (ret) { - sprd_wdt_disable(wdt); + if (ret) return ret; - } + platform_set_drvdata(pdev, wdt); return 0; -- 2.53.0