[WATCHDOG] misc_register patch

[mv-sheeva.git] / drivers / watchdog / wdt977.c

diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index 9b7f6b6edef6df0f75212960dac4696d9cfa68ae..fb4b876c9fdac4aee7fea04ffebe9386d2eda766 100644 (file)
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -470,20 +470,20 @@ static int __init wd977_init(void)
                }
        }
 
-       rc = misc_register(&wdt977_miscdev);
+       rc = register_reboot_notifier(&wdt977_notifier);
        if (rc)
        {
-               printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
-                       wdt977_miscdev.minor, rc);
+               printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
+                       rc);
                goto err_out_region;
        }
 
-       rc = register_reboot_notifier(&wdt977_notifier);
+       rc = misc_register(&wdt977_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",
+                       wdt977_miscdev.minor, rc);
+               goto err_out_reboot;
        }
 
        printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d, testmode=%i)\n",
@@ -491,8 +491,8 @@ static int __init wd977_init(void)
 
        return 0;
 
-err_out_miscdev:
-        misc_deregister(&wdt977_miscdev);
+err_out_reboot:
+       unregister_reboot_notifier(&wdt977_notifier);
 err_out_region:
        if (!machine_is_netwinder())
                release_region(IO_INDEX_PORT,2);