[PATCH v2 3/5] watchdog: s3c2410: re-add nowayout feature

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The 'nowayout' feature got lost during the conversion towards using the
watchdog framework. Reenable it.

Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
---

At this time, only build-tested. Will check on real hardware on wednesday.
Because of being trivial, I send it out already; so the whole series can get
the review.

 drivers/watchdog/s3c2410_wdt.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 5de7e4f..773eee6 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -378,6 +378,9 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
 							"cannot start\n");
 	}
 
+	if (nowayout)
+		s3c2410_wdd.status |= WATCHDOG_NOWAYOUT_INIT_STATUS;
+
 	ret = watchdog_register_device(&s3c2410_wdd);
 	if (ret) {
 		dev_err(dev, "cannot register watchdog (%d)\n", ret);
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux