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 1C3141A76A4; Tue, 30 Jul 2024 17:15:14 +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=1722359714; cv=none; b=NngFLpxiVTa9JETuMZixgj+f+8y7YdByRBo1GpUiZ2ERZPV+V6KJy9Cp++DkJjLZFN3qclGmeAOrFXvMyVH5fX7kD3TkTSMI0s8KAu0BeDIKlB234zU5culX/IYZCxI7pE7bPQoPy2A4vqDgqdU1VNgIjb/CK//plcwk4wCcWts= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722359714; c=relaxed/simple; bh=urs2jCYTjVTHN2cwIpoevSjeJqJCgxot5Xwkeh6fE60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VIXV1W69V3a/DiEawXUThuTwj+GDo0sdnY4XXVr5pObmhbzd+UEe2rlTHBXKgxy9UUEZs8QOFEgrzJXhJPNi+sVYBUAAKro38YdtaMPDFilaoScuXGq0Ds9e4jPjIERE+s6zkXiJKs+YgwgZ9O+Ew0ve9soqZc0qAVEUG8AUk5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OLb4z/wu; 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="OLb4z/wu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81D77C4AF0A; Tue, 30 Jul 2024 17:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722359714; bh=urs2jCYTjVTHN2cwIpoevSjeJqJCgxot5Xwkeh6fE60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OLb4z/wu8vQw1lC7WovZBAUluxsE2WKRunNrKCtM8TdSq3xpN6xU4TkOUG5uQISGI BhTxJCw6Rkj7M3rfJejFsPoQNa84+yuHqkHchb3gJm5wnPvTf8fTJFbUTyIsJrKY+y Mk6PoJJ/eBLvl8pYIjYxb20cX/ZaZPnvarpNbkJw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Claudiu Beznea , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 6.6 526/568] watchdog: rzg2l_wdt: Check return status of pm_runtime_put() Date: Tue, 30 Jul 2024 17:50:33 +0200 Message-ID: <20240730151700.718407952@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151639.792277039@linuxfoundation.org> References: <20240730151639.792277039@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Claudiu Beznea [ Upstream commit 471e45a33302852bf79bc140fe418782f50734f6 ] pm_runtime_put() may return an error code. Check its return status. Along with it the rzg2l_wdt_set_timeout() function was updated to propagate the result of rzg2l_wdt_stop() to its caller. Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L") Signed-off-by: Claudiu Beznea Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20240531065723.1085423-5-claudiu.beznea.uj@bp.renesas.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/rzg2l_wdt.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c index d87d4f50180c5..7bce093316c4d 100644 --- a/drivers/watchdog/rzg2l_wdt.c +++ b/drivers/watchdog/rzg2l_wdt.c @@ -144,9 +144,13 @@ static int rzg2l_wdt_start(struct watchdog_device *wdev) static int rzg2l_wdt_stop(struct watchdog_device *wdev) { struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev); + int ret; rzg2l_wdt_reset(priv); - pm_runtime_put(wdev->parent); + + ret = pm_runtime_put(wdev->parent); + if (ret < 0) + return ret; return 0; } @@ -163,7 +167,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time * to reset the module) so that it is updated with new timeout values. */ if (watchdog_active(wdev)) { - rzg2l_wdt_stop(wdev); + ret = rzg2l_wdt_stop(wdev); + if (ret) + return ret; + ret = rzg2l_wdt_start(wdev); } -- 2.43.0