From 0a60a54742a7f76d594f32a66f939c2965ddb97d Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Fri, 5 Apr 2013 21:22:43 -0700 Subject: [PATCH] --- yaml --- r: 374691 b: refs/heads/master c: 60403f7a4d9368d187f79cba5e4672d01df37574 h: refs/heads/master i: 374689: 81d38e67c7b7bad01f2d957b5029bc2f07862a56 374687: 6d29184fb30662aee07e503168784a166ad240d2 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/watchdog_dev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f872394468e0..c87029a98174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6330c7070be6783b82025d2bc259db8413c00182 +refs/heads/master: 60403f7a4d9368d187f79cba5e4672d01df37574 diff --git a/trunk/drivers/watchdog/watchdog_dev.c b/trunk/drivers/watchdog/watchdog_dev.c index 08b48bbf9f4b..faf4e189fe42 100644 --- a/trunk/drivers/watchdog/watchdog_dev.c +++ b/trunk/drivers/watchdog/watchdog_dev.c @@ -523,6 +523,7 @@ int watchdog_dev_register(struct watchdog_device *watchdog) int err, devno; if (watchdog->id == 0) { + old_wdd = watchdog; watchdog_miscdev.parent = watchdog->parent; err = misc_register(&watchdog_miscdev); if (err != 0) { @@ -531,9 +532,9 @@ int watchdog_dev_register(struct watchdog_device *watchdog) if (err == -EBUSY) pr_err("%s: a legacy watchdog module is probably present.\n", watchdog->info->identity); + old_wdd = NULL; return err; } - old_wdd = watchdog; } /* Fill in the data structures */