diff options
| author | Wim Van Sebroeck | 2007-12-26 21:32:51 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck | 2008-01-25 21:31:50 +0100 |
| commit | c6cb13aead3a3cf5bd3e2cfa945602d5cd7825cd (patch) | |
| tree | ecff4a444e33d0ca24925e92fee4f9021ba981b8 /drivers/watchdog/alim7101_wdt.c | |
| parent | [WATCHDOG] wdt: fix locking (diff) | |
| download | kernel-qcow2-linux-c6cb13aead3a3cf5bd3e2cfa945602d5cd7825cd.tar.gz kernel-qcow2-linux-c6cb13aead3a3cf5bd3e2cfa945602d5cd7825cd.tar.xz kernel-qcow2-linux-c6cb13aead3a3cf5bd3e2cfa945602d5cd7825cd.zip | |
[WATCHDOG] misc_register patch
Make sure that we first do a register_reboot_notifier before we
do a misc_register. A misc_register opens the interface to
userspace and it's best to do this as the last action.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/alim7101_wdt.c')
| -rw-r--r-- | drivers/watchdog/alim7101_wdt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 67aed9f8c362..238273c98656 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c @@ -377,18 +377,18 @@ static int __init alim7101_wdt_init(void) timeout); } - rc = misc_register(&wdt_miscdev); + rc = register_reboot_notifier(&wdt_notifier); if (rc) { - printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", - wdt_miscdev.minor, rc); + printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", + rc); goto err_out; } - rc = register_reboot_notifier(&wdt_notifier); + rc = misc_register(&wdt_miscdev); if (rc) { - printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", - rc); - goto err_out_miscdev; + printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", + wdt_miscdev.minor, rc); + goto err_out_reboot; } if (nowayout) { @@ -399,8 +399,8 @@ static int __init alim7101_wdt_init(void) timeout, nowayout); return 0; -err_out_miscdev: - misc_deregister(&wdt_miscdev); +err_out_reboot: + unregister_reboot_notifier(&wdt_notifier); err_out: pci_dev_put(alim7101_pmu); return rc; |