From: Wang Li <wangli74@huawei.com>
To: <wim@linux-watchdog.org>, <linux@roeck-us.net>, <krzk@kernel.org>
Cc: <linux-watchdog@vger.kernel.org>, <wangli74@huawei.com>
Subject: [PATCH v2] watchdog: rti-wdt: disable runtime pm in case of failure
Date: Wed, 25 Nov 2020 16:29:56 +0800 [thread overview]
Message-ID: <20201125082956.3325066-1-wangli74@huawei.com> (raw)
In case of runtime pm failed, should disable runtime pm.
Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Li <wangli74@huawei.com>
---
Changelog:
v2
- Change the fix tag.
---
drivers/watchdog/rti_wdt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index 836319cbaca9..8885841eef4f 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -227,8 +227,10 @@ static int rti_wdt_probe(struct platform_device *pdev)
pm_runtime_enable(dev);
ret = pm_runtime_get_sync(dev);
- if (ret)
- return dev_err_probe(dev, ret, "runtime pm failed\n");
+ if (ret) {
+ ret = dev_err_probe(dev, ret, "runtime pm failed\n");
+ goto err_iomap;
+ }
platform_set_drvdata(pdev, wdt);
--
2.25.4
next reply other threads:[~2020-11-25 8:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 8:29 Wang Li [this message]
2020-11-25 8:39 ` [PATCH v2] watchdog: rti-wdt: disable runtime pm in case of failure Krzysztof Kozlowski
2020-11-25 14:15 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201125082956.3325066-1-wangli74@huawei.com \
--to=wangli74@huawei.com \
--cc=krzk@kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).