From: Jerry Hoemann <jerry.hoemann@hpe.com>
To: wim@linux-watchdog.org, linux@roeck-us.net
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Jerry Hoemann <jerry.hoemann@hpe.com>
Subject: [PATCH 1/4] watchdog: hpwdt: Initialize pretimeout from module parameter.
Date: Thu, 2 Aug 2018 15:15:38 -0600 [thread overview]
Message-ID: <1533244541-42310-2-git-send-email-jerry.hoemann@hpe.com> (raw)
In-Reply-To: <1533244541-42310-1-git-send-email-jerry.hoemann@hpe.com>
When the pretimeout is specified as a module parameter, the
value should be reflected in hpwdt_dev.pretimeout. The default
(on) case is correct. But, when disabling pretimeout, the value
should be set to zero in hpwdt_dev.
Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
---
drivers/watchdog/hpwdt.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 9dc62a4..369022d 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -313,6 +313,11 @@ static int hpwdt_init_one(struct pci_dev *dev,
if (watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL))
dev_warn(&dev->dev, "Invalid soft_margin: %d.\n", soft_margin);
+#ifdef CONFIG_HPWDT_NMI_DECODING
+ if (!pretimeout)
+ hpwdt_dev.pretimeout = 0;
+#endif
+
hpwdt_dev.parent = &dev->dev;
retval = watchdog_register_device(&hpwdt_dev);
if (retval < 0) {
--
1.8.3.1
next prev parent reply other threads:[~2018-08-02 21:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 21:15 [PATCH 0/4] watchdog: hpwdt: Bug Fixes/Enhancement Jerry Hoemann
2018-08-02 21:15 ` Jerry Hoemann [this message]
2018-08-05 1:08 ` [PATCH 1/4] watchdog: hpwdt: Initialize pretimeout from module parameter Guenter Roeck
2018-08-07 15:46 ` Jerry Hoemann
2018-08-02 21:15 ` [PATCH 2/4] watchdog: hpwdt: Claim NMI from iLO Jerry Hoemann
2018-08-05 1:09 ` Guenter Roeck
2018-08-08 19:12 ` Jerry Hoemann
2018-08-02 21:15 ` [PATCH 3/4] watchdog: hpwdt: Display module parameters Jerry Hoemann
2018-08-05 1:13 ` Guenter Roeck
2018-08-06 23:19 ` Jerry Hoemann
2018-08-07 2:28 ` Guenter Roeck
2018-08-02 21:15 ` [PATCH 4/4] watchdog: hpwdt: Update version number Jerry Hoemann
2018-08-05 1:16 ` 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=1533244541-42310-2-git-send-email-jerry.hoemann@hpe.com \
--to=jerry.hoemann@hpe.com \
--cc=linux-kernel@vger.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).