mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Marc Vertes <marc.vertes@sigfox.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH] watchdog: fix nowayout setting in wm831x_wdt
Date: Fri, 25 Nov 2011 23:55:28 +0100	[thread overview]
Message-ID: <4ed01ce0.pLO/jX2YTtsMsYc8%marc.vertes@sigfox.com> (raw)

Use set_bit() to set the nowayout flag, as WDOG_NO_WAY_OUT is a
bit number, not a mask. It avoids corruption of status flag.

Signed-off-by: Marc Vertes <marc.vertes@sigfox.com>
---

 wm831x_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-3.2-rc3/drivers/watchdog/wm831x_wdt.c.orig	2011-11-24 05:20:28.000000000 +0100
+++ linux-3.2-rc3/drivers/watchdog/wm831x_wdt.c	2011-11-25 23:22:22.447258730 +0100
@@ -216,7 +216,7 @@ static int __devinit wm831x_wdt_probe(st
 	watchdog_set_drvdata(wm831x_wdt, driver_data);
 
 	if (nowayout)
-		wm831x_wdt->status |= WDOG_NO_WAY_OUT;
+		setbit(WDOG_NO_WAY_OUT, &wm831x_wdt->status);
 
 	reg = wm831x_reg_read(wm831x, WM831X_WATCHDOG);
 	reg &= WM831X_WDOG_TO_MASK;

             reply	other threads:[~2011-11-25 23:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-25 22:55 Marc Vertes [this message]
2011-11-25 23:01 ` Marc Vertes

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=4ed01ce0.pLO/jX2YTtsMsYc8%marc.vertes@sigfox.com \
    --to=marc.vertes@sigfox.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=wim@iguana.be \
    /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

all inboxes | Powered by JetHome®