| Message ID | fbb650650bbb33a8fa2fd028c23157bedeed50e1.1682491863.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp53146vqo;
Wed, 26 Apr 2023 00:06:09 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ6BLlOclaRvRtjtF9FO7C8lcyPnn1b8rV79KbBg9sOXAYAx+AxYX4jti/2Yh43+oUcck+QK
X-Received: by 2002:a05:6a20:8401:b0:f6:d60d:dbc2 with SMTP id
c1-20020a056a20840100b000f6d60ddbc2mr2575704pzd.28.1682492769391;
Wed, 26 Apr 2023 00:06:09 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1682492769; cv=none;
d=google.com; s=arc-20160816;
b=zMxbM8tG3pmloI6pp6q3V2tCFUUFglLjT4c/JHZD7ypYOtUrzB82nICjk7KBUYH/Fq
1UWqWZEUegTdfKrbCX3/FdRHezTJKnPO6rmRr1vUGmDXBsAYcCMnVGFGKZaglKKcvCtL
rPxJwXWIf+tiFKg6qqbuiE6vf6BdERIJv+dEggjmOJl27aWIDkmZRC04UbDWglBVf0Cv
1k37YI3Y9kctMjck4hI4CiqodD5TFS3Iir6ZmOjYgvIEVqInD73x/VSHkWJ2/HhF95pm
uCiplkzekEZeJrYpwhnIFOhmZ+sbTfKIyrqis0wUITVDYJ/uySeMfiXCBeATNs6ERvpv
vJOg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=KAtKMyZd7naxOW+Rdd07F5idduJev/3DNob3RYZOyX4=;
b=raEHy9WL+WT8aQjB2kaE2G1oWVTjdFV2vKcw4pmV2pcIlFSonY3bg/f9Lnj2P5UKwh
w/Z9o69Qv0n/KKmbsflbnWwPeC4dqJ/ewwZI4Wrp63UGvFkoUQNUgCf3NWdVkCE/qN3D
pQKRJU+cPRaukdB/7hjoRpc4zFwMKNEkCmGEtLF2EnM3nyIOm3jxk1akdDAmEKnonkGe
SXXN5jvsfc/0AldcBpFp+9zVPKuy5z/eTF/8x7d13G8XaR0zxnxYm4GLPgSv0yX6+Mfj
OQELythPL7eE060L2jAQDEvLZMdee3MDg1jJ4gvP7iY2Jw7fIQrY/Z/P58IrRAhUK3Ml
vBJA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=jtcYJmJz;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
c19-20020a621c13000000b0063b8b114678si15526919pfc.393.2023.04.26.00.05.55;
Wed, 26 Apr 2023 00:06:09 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=jtcYJmJz;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S239544AbjDZGxX (ORCPT <rfc822;zxc52fgh@gmail.com> + 99 others);
Wed, 26 Apr 2023 02:53:23 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33900 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S239361AbjDZGxU (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 26 Apr 2023 02:53:20 -0400
Received: from smtp.smtpout.orange.fr (smtp-22.smtpout.orange.fr
[80.12.242.22])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B23230C1
for <linux-kernel@vger.kernel.org>;
Tue, 25 Apr 2023 23:53:07 -0700 (PDT)
Received: from pop-os.home ([86.243.2.178])
by smtp.orange.fr with ESMTPA
id rZ1RpwxQZMX1TrZ1Rpoi5U; Wed, 26 Apr 2023 08:53:05 +0200
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr;
s=t20230301; t=1682491985;
bh=KAtKMyZd7naxOW+Rdd07F5idduJev/3DNob3RYZOyX4=;
h=From:To:Cc:Subject:Date;
b=jtcYJmJzwcQembazxEh1mO1fWZlBgEiuhDv3/vLwH2iUAI4V/z95jF5L9LY4f9NZv
si+K/7yFFq3Q40CA0IXnCQRaFpeWL0E9oZayGh/WBL8PnmOIk/HkBeeXiDRZNCUfK+
7/tw9+Zg/0wISwhCG+qE2ANsbfBthzZBFAnOfbfUqPCW4k9TAGqS0lLye2TOg1c5YF
KnaFAweV5CYgYxr9brt301VM67gBl5aJIzr7fwHvKizLctjMwJRrj4ivokDlbm6Vxc
4HIYWw564uGM0GJnlMve910B3V9GiDm/8CbePGw7nLbAuxA1GtndlpvqT80urrAdD1
L99XAbt5Z8CYw==
X-ME-Helo: pop-os.home
X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI=
X-ME-Date: Wed, 26 Apr 2023 08:53:05 +0200
X-ME-IP: 86.243.2.178
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Philipp Zabel <p.zabel@pengutronix.de>,
Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Wim Van Sebroeck <wim@iguana.be>,
linux-watchdog@vger.kernel.org
Subject: [PATCH 1/2] watchdog: dw_wdt: Fix the error handling path of
dw_wdt_drv_probe()
Date: Wed, 26 Apr 2023 08:52:48 +0200
Message-Id:
<fbb650650bbb33a8fa2fd028c23157bedeed50e1.1682491863.git.christophe.jaillet@wanadoo.fr>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1764221538195000459?=
X-GMAIL-MSGID: =?utf-8?q?1764221538195000459?=
|
| Series |
[1/2] watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
|
|
Commit Message
Christophe JAILLET
April 26, 2023, 6:52 a.m. UTC
The commit in Fixes has only updated the remove function and missed the
error handling path of the probe.
Add the missing reset_control_assert() call.
Fixes: 65a3b6935d92 ("watchdog: dw_wdt: get reset lines from dt")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/watchdog/dw_wdt.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Comments
Hi Christophe, On Wed, Apr 26, 2023 at 08:52:48AM +0200, Christophe JAILLET wrote: > The commit in Fixes has only updated the remove function and missed the > error handling path of the probe. > > Add the missing reset_control_assert() call. > > Fixes: 65a3b6935d92 ("watchdog: dw_wdt: get reset lines from dt") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
On Wed, Apr 26, 2023 at 08:52:48AM +0200, Christophe JAILLET wrote: > The commit in Fixes has only updated the remove function and missed the > error handling path of the probe. > > Add the missing reset_control_assert() call. > > Fixes: 65a3b6935d92 ("watchdog: dw_wdt: get reset lines from dt") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/dw_wdt.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c > index 6f88bd81f8a1..a1354a59eb37 100644 > --- a/drivers/watchdog/dw_wdt.c > +++ b/drivers/watchdog/dw_wdt.c > @@ -635,7 +635,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) > > ret = dw_wdt_init_timeouts(dw_wdt, dev); > if (ret) > - goto out_disable_clk; > + goto out_assert_rst; > > wdd = &dw_wdt->wdd; > wdd->ops = &dw_wdt_ops; > @@ -667,12 +667,15 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) > > ret = watchdog_register_device(wdd); > if (ret) > - goto out_disable_pclk; > + goto out_assert_rst; > > dw_wdt_dbgfs_init(dw_wdt); > > return 0; > > +out_assert_rst: > + reset_control_assert(dw_wdt->rst); > + > out_disable_pclk: > clk_disable_unprepare(dw_wdt->pclk); > > -- > 2.34.1 >
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 6f88bd81f8a1..a1354a59eb37 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -635,7 +635,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) ret = dw_wdt_init_timeouts(dw_wdt, dev); if (ret) - goto out_disable_clk; + goto out_assert_rst; wdd = &dw_wdt->wdd; wdd->ops = &dw_wdt_ops; @@ -667,12 +667,15 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) ret = watchdog_register_device(wdd); if (ret) - goto out_disable_pclk; + goto out_assert_rst; dw_wdt_dbgfs_init(dw_wdt); return 0; +out_assert_rst: + reset_control_assert(dw_wdt->rst); + out_disable_pclk: clk_disable_unprepare(dw_wdt->pclk);