aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-05-27 15:33:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-05-27 15:33:18 +0000
commit72cc296822cc8dc43032dcb4ea0a1f61fd6fc4fd (patch)
treea951d87404d9a22862405d02f83430c22c81ac09
parente6f66794611fdf62487cd931851089157b2252d2 (diff)
downloadupstream-72cc296822cc8dc43032dcb4ea0a1f61fd6fc4fd.tar.gz
upstream-72cc296822cc8dc43032dcb4ea0a1f61fd6fc4fd.tar.bz2
upstream-72cc296822cc8dc43032dcb4ea0a1f61fd6fc4fd.zip
avila-wdt: add support for disabling the watchdog
SVN-Revision: 16111
-rw-r--r--package/avila-wdt/src/avila-wdt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/avila-wdt/src/avila-wdt.c b/package/avila-wdt/src/avila-wdt.c
index 6b3b42b092..18644bc603 100644
--- a/package/avila-wdt/src/avila-wdt.c
+++ b/package/avila-wdt/src/avila-wdt.c
@@ -74,10 +74,8 @@ static void wdt_enable(void)
static void wdt_disable(void)
{
- /* NB: we can't turn off the watchdog anymore, so we
- * have to keep running the strobe timer without decrementing
- * the counter */
- clear_bit(WDT_RUNNING, &wdt_status);
+ /* Re-enable clock generator output on GPIO 14/15 */
+ *IXP4XX_GPIO_GPCLKR |= (1 << 8);
}
static int avila_wdt_open(struct inode *inode, struct file *file)
@@ -209,6 +207,8 @@ static int __init avila_wdt_init(void)
static void __exit avila_wdt_exit(void)
{
misc_deregister(&avila_wdt_miscdev);
+ del_timer(&wdt_timer);
+ wdt_disable();
}