projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[WATCHDOG] misc_register patch
[powerpc.git]
/
drivers
/
watchdog
/
alim7101_wdt.c
diff --git
a/drivers/watchdog/alim7101_wdt.c
b/drivers/watchdog/alim7101_wdt.c
index
67aed9f
..
238273c
100644
(file)
--- a/
drivers/watchdog/alim7101_wdt.c
+++ b/
drivers/watchdog/alim7101_wdt.c
@@
-377,18
+377,18
@@
static int __init alim7101_wdt_init(void)
timeout);
}
timeout);
}
- rc =
misc_register(&wdt_miscdev
);
+ rc =
register_reboot_notifier(&wdt_notifier
);
if (rc) {
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;
}
goto err_out;
}
- rc =
register_reboot_notifier(&wdt_notifier
);
+ rc =
misc_register(&wdt_miscdev
);
if (rc) {
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) {
}
if (nowayout) {
@@
-399,8
+399,8
@@
static int __init alim7101_wdt_init(void)
timeout, nowayout);
return 0;
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;
err_out:
pci_dev_put(alim7101_pmu);
return rc;