diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2007-10-08 01:44:39 +0000 |
|---|---|---|
| committer | Matteo Croce <rootkit85@yahoo.it> | 2007-10-08 01:44:39 +0000 |
| commit | 92378640d26e4b62e39941b5460c4ee4906025cb (patch) | |
| tree | cf340c9a4aa67acd482a35ff8e60c26f8fd985c7 /target | |
| parent | 38315565b25625b89622d703cd5fd529acf446b4 (diff) | |
| download | upstream-92378640d26e4b62e39941b5460c4ee4906025cb.tar.gz upstream-92378640d26e4b62e39941b5460c4ee4906025cb.tar.bz2 upstream-92378640d26e4b62e39941b5460c4ee4906025cb.zip | |
backport ar7_wdt from linux-2.6-watchdog-mm
SVN-Revision: 9182
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c | 24 |
1 files changed, 11 insertions, 13 deletions
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 2ae83e1cd1..cdaab8c3d3 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 + * drivers/watchdog/ar7_wdt.c * - * Copyright (C) 2007 OpenWrt.org + * Copyright (C) 2007 Nicolas Thill <nico@openwrt.org> * Copyright (c) 2005 Enrik Berkhan <Enrik.Berkhan@akk.org> * * Some code taken from: @@ -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; @@ -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)); } |