Hi Guenter,
On Fri, 19 Jun 2015 18:50:35 -0700, Guenter Roeck wrote:
> Hi Jean,
>
> On 06/19/2015 08:01 AM, Jean Delvare wrote:
> > WDIOC_SETOPTIONS makes it possible to disable and re-enable the
> > watchdog timer while the hpwdt driver is loaded.
> >
> > Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
> > Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
> > ---
> > Untested. It would be great if someone at HP (or anyone with the
> > hardware, I guess) could test and review this patch. Thanks.
>
> Any chance you can convert the driver to a new style watchdog driver
> instead ?
I knew someone would suggest that at some point. But this would be a
much larger change and I don't feel confident doing it myself because I
am not able to test the driver.
> > drivers/watchdog/hpwdt.c | 19 ++++++++++++++++++-
> > 1 file changed, 18 insertions(+), 1 deletion(-)
> >
> > --- linux-4.1-rc8.orig/drivers/watchdog/hpwdt.c 2015-06-19 11:40:15.885626732 +0200
> > +++ linux-4.1-rc8/drivers/watchdog/hpwdt.c 2015-06-19 11:52:14.375776480 +0200
> > @@ -588,7 +588,7 @@ static long hpwdt_ioctl(struct file *fil
> > {
> > void __user *argp = (void __user *)arg;
> > int __user *p = argp;
> > - int new_margin;
> > + int new_margin, options;
> > int ret = -ENOTTY;
> >
> > switch (cmd) {
> > @@ -608,6 +608,23 @@ static long hpwdt_ioctl(struct file *fil
> > ret = 0;
> > break;
> >
> > + case WDIOC_SETOPTIONS:
> > + ret = get_user(options, p);
> > + if (ret)
> > + break;
> > +
> > + if (options & WDIOS_DISABLECARD) {
> > + hpwdt_stop();
> > + ret = 0;
>
> ret is already 0 here.
>
> > + }
> > +
> > + if (options & WDIOS_ENABLECARD) {
> > + hpwdt_start();
> > + hpwdt_ping();
> > + ret = 0;
>
> Same here.
Right. I'll fix it up and send an updated patch. Thanks for the review!
--
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
