Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3037525ybt; Mon, 29 Jun 2020 13:34:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsx4xHKliZI1M5QCJ2HAAYfAhsdZPOWlRsQBxQvwryh+aXW2xpcoWWWmvSv49K/J6O0NkX X-Received: by 2002:a17:906:d286:: with SMTP id ay6mr6692070ejb.400.1593462882961; Mon, 29 Jun 2020 13:34:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462882; cv=none; d=google.com; s=arc-20160816; b=VHAOFo/II8zNn2Sn9eTo51ZS3yOOMWbtiXJ+0QwlfqNqSOxNu61AwNgUT+spemQbz8 18zIp5MlzphZ/xfpuoJlM6TqoTOVuR0C74mHsDVBsB2JUYq/a2klvRoCf4ER9bv1Hb2l 0HkDqaQhQmnTs/qmh2QaNSQP67MEdaTA/U14jFhfrMMOpYC90k3RdzbbCSD1VLlpE9Wf ijz7jQRASMdAOJAyQcOQrMYKDiSBUdIr+jgEVp3gEuR4wO0XIHQvYevhlXrqxlbVsDlb lP3DG285+ZcdebectC+7ZrCviTxGokBRKri30O9w/wt7sPRzUGymCaUruPZAL1PR2OVd y+tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mum7BBEK0UmydIyO0nkn6PwG+GKlcIgjx9o54Ll5p6Y=; b=av5aXLbqN0Nj4GuFsgg1AAJvkYqP0m+CX0MaG6wcNy2x1kVBzrPih73tGMsGhcSLwV cWjVOR0hKOc3W7EytROKQOmPd/jY0zoAotoQl+2M3E73UoVeJiAXtJ1P8GeE8QH5M7qX 5n1Y7G80yvz2T9MxYv8uD3aDyxjaAfrtCB3W7wp31Wmma14/NO2XL4CjX5g1FHxyUQuS g7m+F8syS/enMI5GGknZkEKz6nTL0Wk7Rbuf+umqE3u5RSpAdCRgkilxk+HMXhr+4lPu xcIWpZPN/ZxR43/MqN1S7Yuv9+KXB0blFdEKyhntTHhJCri/gz+CvIPNVS198WvsCWFV Q52Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="fToyxOt/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g26si351799edu.253.2020.06.29.13.34.20; Mon, 29 Jun 2020 13:34:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="fToyxOt/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389329AbgF2Uc7 (ORCPT + 99 others); Mon, 29 Jun 2020 16:32:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:37042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732398AbgF2TZS (ORCPT ); Mon, 29 Jun 2020 15:25:18 -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 90937253A9; Mon, 29 Jun 2020 15:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445274; bh=cPJjhIRuVR6ILETKUiSiAnd68luBbKR16bzeD9+IJi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fToyxOt/AQBwRlbqU/YTPfTbfQ2lXZrzl/WmzUM56A9InEIq3J0V+iTSVJDbqUhfR 94tJbNATwCrgGHWgxwk9/H0KTGR7kS/n8fQEvxFwh751rWAHfdTkNzoqXvRg1vhleC Y2uxc4moUgYhEnMPjpq/BLwiB5JIHvvJURorfH0w= 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 Subject: [PATCH 4.9 053/191] watchdog: da9062: No need to ping manually before setting timeout Date: Mon, 29 Jun 2020 11:37:49 -0400 Message-Id: <20200629154007.2495120-54-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+00:00 X-stable: review X-Patchwork-Hint: Ignore 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 daeb645fcea8a..519419136ce8f 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