diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 09:00:01 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 09:00:01 +1100 |
| commit | 8561b089afbaed2651591e5a4574fdca451d82f2 (patch) | |
| tree | 3c3bd24884eb65a89b0b896bcd7790e6144cebfc /drivers/watchdog/sbc60xxwdt.c | |
| parent | e189f3495c4e30fc84fc9241096edf3932e23439 (diff) | |
| parent | b47a166ed0baaaa30112532bad41b21e7c5e4d31 (diff) | |
| download | linux-8561b089afbaed2651591e5a4574fdca451d82f2.tar.gz linux-8561b089afbaed2651591e5a4574fdca451d82f2.tar.bz2 linux-8561b089afbaed2651591e5a4574fdca451d82f2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] constify function pointer tables
[WATCHDOG] TXx9 watchdog driver
[WATCHDOG] misc_register patch
[WATCHDOG] wdt: fix locking
Diffstat (limited to 'drivers/watchdog/sbc60xxwdt.c')
| -rw-r--r-- | drivers/watchdog/sbc60xxwdt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c index e4f3cb6090bc..ef76f01625e7 100644 --- a/drivers/watchdog/sbc60xxwdt.c +++ b/drivers/watchdog/sbc60xxwdt.c @@ -359,20 +359,20 @@ static int __init sbc60xxwdt_init(void) } } - 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_region2; } - 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; } printk(KERN_INFO PFX "WDT driver for 60XX single board computer initialised. timeout=%d sec (nowayout=%d)\n", @@ -380,8 +380,8 @@ static int __init sbc60xxwdt_init(void) return 0; -err_out_miscdev: - misc_deregister(&wdt_miscdev); +err_out_reboot: + unregister_reboot_notifier(&wdt_notifier); err_out_region2: if ((wdt_stop != 0x45) && (wdt_stop != wdt_start)) release_region(wdt_stop,1); |