X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Favila-wdt%2Fsrc%2Favila-wdt.c;h=18644bc6038bd814cd0dee70d0faa734e10320a9;hb=ca78cbf57d24817d0f08b0a3b8312d9588930d36;hp=6b3b42b092af7abd6a2c1839fe04c6bebd268c58;hpb=abaf2ffdcf152689802d935daaef57481b3092dc;p=openwrt-10.03%2F.git

diff --git a/package/avila-wdt/src/avila-wdt.c b/package/avila-wdt/src/avila-wdt.c
index 6b3b42b09..18644bc60 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();
 }