|
@@ -523,6 +523,7 @@ int watchdog_dev_register(struct watchdog_device *watchdog)
|
|
int err, devno;
|
|
int err, devno;
|
|
|
|
|
|
if (watchdog->id == 0) {
|
|
if (watchdog->id == 0) {
|
|
|
|
+ old_wdd = watchdog;
|
|
watchdog_miscdev.parent = watchdog->parent;
|
|
watchdog_miscdev.parent = watchdog->parent;
|
|
err = misc_register(&watchdog_miscdev);
|
|
err = misc_register(&watchdog_miscdev);
|
|
if (err != 0) {
|
|
if (err != 0) {
|
|
@@ -531,9 +532,9 @@ int watchdog_dev_register(struct watchdog_device *watchdog)
|
|
if (err == -EBUSY)
|
|
if (err == -EBUSY)
|
|
pr_err("%s: a legacy watchdog module is probably present.\n",
|
|
pr_err("%s: a legacy watchdog module is probably present.\n",
|
|
watchdog->info->identity);
|
|
watchdog->info->identity);
|
|
|
|
+ old_wdd = NULL;
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
- old_wdd = watchdog;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Fill in the data structures */
|
|
/* Fill in the data structures */
|