diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-05-27 15:33:18 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-05-27 15:33:18 +0000 |
commit | 65e9ce52b2d7532798948f028e503ba3ec0a554f (patch) | |
tree | 2f753b6ef8fc1db0ce6c0315c2c6a957b2a7730d | |
parent | d8215381dbcb197a538a1a462eac72398861082d (diff) | |
download | upstream-65e9ce52b2d7532798948f028e503ba3ec0a554f.tar.gz upstream-65e9ce52b2d7532798948f028e503ba3ec0a554f.tar.bz2 upstream-65e9ce52b2d7532798948f028e503ba3ec0a554f.zip |
avila-wdt: add support for disabling the watchdog
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16111 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/avila-wdt/src/avila-wdt.c | 8 |
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(); } |