From mboxrd@z Thu Jan 1 00:00:00 1970 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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A7C72C433DF for ; Tue, 23 Jun 2020 20:52:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73A2C20702 for ; Tue, 23 Jun 2020 20:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945542; bh=uqj9LlV6wpnyksVFlwbmyPsNGWszrcyh1dI43T+emtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2nskc4+ekjP8vRlXtAVCNIu+FouqqMjNCScpBfKK0vdjySa0LzlkI5p6U8z/OCDy7 3aWTRGWgKrsOztBt9jRgiDQ3HlsBx/HVtGTUXOGVcB7t8u7mLxKgac3LWQrk0kqtgF InmF3YYb9sDmnqSasCZqUoe3HUaAoMWQ3OFMh0pg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403923AbgFWUwU (ORCPT ); Tue, 23 Jun 2020 16:52:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:46140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392699AbgFWUrh (ORCPT ); Tue, 23 Jun 2020 16:47:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1A2C82098B; Tue, 23 Jun 2020 20:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945257; bh=uqj9LlV6wpnyksVFlwbmyPsNGWszrcyh1dI43T+emtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wUJkMCPOkHFC/rVgOibuCxmw4WIs3KNaeJr8wq2kRdTuGxLovrOJPMjbk8FIuNQAc 1ovUL6TgCCAOpZQ4pNWhjqvXNJdogRdTgHNLFA+anIaFFT+1nE5WMHk5D6TPWNHR08 XYT8FiAI6PTyEtvROz7ZVBD/7B/mV0xrrF32VK18= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Riedmueller , Guenter Roeck , Adam Thomson , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 4.14 070/136] watchdog: da9062: No need to ping manually before setting timeout Date: Tue, 23 Jun 2020 21:58:46 +0200 Message-Id: <20200623195307.202137941@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 79383ff620199..1443386bb590b 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