X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/91d6f27676c4d2dc432ea32729cc9dadc55e4d4c..e6a2f81c9cf8a6749cde3ea640150c2c496971b7:/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c

diff --git a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
index 889306188..97cd8105a 100644
--- a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
+++ b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
@@ -1,7 +1,7 @@
 /*
- * linux/drivers/char/ar7_wdt.c
- * 
- * Copyright (C) 2007 OpenWrt.org
+ * drivers/watchdog/ar7_wdt.c
+ *
+ * Copyright (C) 2007 Nicolas Thill <nico@openwrt.org>
  * Copyright (c) 2005 Enrik Berkhan <Enrik.Berkhan@akk.org>
  *
  * Some code taken from:
@@ -12,12 +12,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -55,8 +55,8 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
 
-#define READ_REG(x) readl((void __iomem*)&(x))
-#define WRITE_REG(x,v) writel((v), (void __iomem*)&(x))
+#define READ_REG(x) readl((void __iomem *)&(x))
+#define WRITE_REG(x, v) writel((v), (void __iomem *)&(x))
 
 struct ar7_wdt {
 	u32 kick_lock;
@@ -184,7 +184,7 @@ static int ar7_wdt_open(struct inode *inode, struct file *file)
 	ar7_wdt_enable_wdt();
 	expect_close = 0;
 
-	return 0;
+	return nonseekable_open(inode, file);
 }
 
 static int ar7_wdt_release(struct inode *inode, struct file *file)
@@ -218,9 +218,6 @@ static struct notifier_block ar7_wdt_notifier = {
 static ssize_t ar7_wdt_write(struct file *file, const char *data,
 			     size_t len, loff_t *ppos)
 {
-	if (ppos != &file->f_pos)
-		return -ESPIPE;
-
 	/* check for a magic close character */
 	if (len) {
 		size_t i;
@@ -246,7 +243,7 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file,
 	static struct watchdog_info ident = {
 		.identity = LONGNAME,
 		.firmware_version = 1,
-		.options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING),
+		.options = (WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING),
 	};
 	int new_margin;
 
@@ -317,23 +314,24 @@ static int __init ar7_wdt_init(void)
 
 	sema_init(&open_semaphore, 1);
 
-	rc = misc_register(&ar7_wdt_miscdev);
+	rc = register_reboot_notifier(&ar7_wdt_notifier);
 	if (rc) {
-		printk(KERN_ERR DRVNAME ": unable to register misc device\n");
+		printk(KERN_ERR DRVNAME
+			": unable to register reboot notifier\n");
 		goto out_alloc;
 	}
 
-	rc = register_reboot_notifier(&ar7_wdt_notifier);
+	rc = misc_register(&ar7_wdt_miscdev);
 	if (rc) {
-		printk(KERN_ERR DRVNAME
-			": unable to register reboot notifier\n");
+		printk(KERN_ERR DRVNAME ": unable to register misc device\n");
 		goto out_register;
 	}
 	goto out;
 
 out_register:
-	misc_deregister(&ar7_wdt_miscdev);
+	unregister_reboot_notifier(&ar7_wdt_notifier);
 out_alloc:
+	iounmap(ar7_wdt);
 	release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt));
 out:
 	return rc;
@@ -341,8 +339,8 @@ out:
 
 static void __exit ar7_wdt_cleanup(void)
 {
-	unregister_reboot_notifier(&ar7_wdt_notifier);
 	misc_deregister(&ar7_wdt_miscdev);
+	unregister_reboot_notifier(&ar7_wdt_notifier);
 	iounmap(ar7_wdt);
 	release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt));
 }