Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6EB2C433E0 for ; Thu, 18 Jun 2020 01:27:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83BD8221F3 for ; Thu, 18 Jun 2020 01:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443655; bh=8vtMscpo/rB1MwKje5YNSEWmr1QhISDAulSDohBlVBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ab7HsLvMrwTclXIPeUpfKTTipT69vVnzRSb5CjLaU0F7+9jlbFqzRDw29A5MjsIyv fzNxQH+bOjawaACwms/yvVY+9nNmZht3Wu/KfoIJYEuDXu/uOUT4hiR7kfcGBkWmNq 2zuxhDUTIv4ewVPj7P+no1OQ3nLDaYDVLphHHZkw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731891AbgFRB1e (ORCPT ); Wed, 17 Jun 2020 21:27:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:35722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731881AbgFRB1d (ORCPT ); Wed, 17 Jun 2020 21:27:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94BFE221EB; Thu, 18 Jun 2020 01:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443652; bh=8vtMscpo/rB1MwKje5YNSEWmr1QhISDAulSDohBlVBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8C4r9VL5OB5qmF2JHo/SMQg9A+wX5suhJUfKnrgYeJK/zjX+iVFqOpm3JOtZDJeH aEJXtXAUEq7saCZ9W/C0iXKZc48ZXDGTW3BgesI+RaRNpBaf5ripkMYt/rl3jgbojK Xzl2sAsR8ctYJSZn70uc1e8Z5deGCymuLAo33jhk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Riedmueller , Guenter Roeck , Adam Thomson , Wim Van Sebroeck , Sasha Levin , linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 072/108] watchdog: da9062: No need to ping manually before setting timeout Date: Wed, 17 Jun 2020 21:25:24 -0400 Message-Id: <20200618012600.608744-72-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012600.608744-1-sashal@kernel.org> References: <20200618012600.608744-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Stefan Riedmueller [ Upstream commit a0948ddba65f4f6d3cfb5e2b84685485d0452966 ] There is actually no need to ping the watchdog before disabling it during timeout change. Disabling the watchdog already takes care of resetting the counter. This fixes an issue during boot when the userspace watchdog handler takes over and the watchdog is already running. Opening the watchdog in this case leads to the first ping and directly after that without the required heartbeat delay a second ping issued by the set_timeout call. Due to the missing delay this resulted in a reset. Signed-off-by: Stefan Riedmueller Reviewed-by: Guenter Roeck Reviewed-by: Adam Thomson Link: https://lore.kernel.org/r/20200403130728.39260-3-s.riedmueller@phytec.de Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/da9062_wdt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c index 79383ff62019..1443386bb590 100644 --- a/drivers/watchdog/da9062_wdt.c +++ b/drivers/watchdog/da9062_wdt.c @@ -94,11 +94,6 @@ static int da9062_wdt_update_timeout_register(struct da9062_watchdog *wdt, unsigned int regval) { struct da9062 *chip = wdt->hw; - int ret; - - ret = da9062_reset_watchdog_timer(wdt); - if (ret) - return ret; return regmap_update_bits(chip->regmap, DA9062AA_CONTROL_D, -- 2.25.1