Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323021
b: refs/heads/master
c: b232a70
h: refs/heads/master
i:
  323019: 82c9e8b
v: v3
  • Loading branch information
Wei Yongjun authored and Wim Van Sebroeck committed Sep 10, 2012
1 parent 2c8cba4 commit f29933d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 308b135e4fcc00c80c07e0e04e7afa8edf78583c
refs/heads/master: b232a70a1735c004f9ee6fdf363def527b9234b6
3 changes: 2 additions & 1 deletion trunk/drivers/watchdog/watchdog_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,12 @@ EXPORT_SYMBOL_GPL(watchdog_register_device);
void watchdog_unregister_device(struct watchdog_device *wdd)
{
int ret;
int devno = wdd->cdev.dev;
int devno;

if (wdd == NULL)
return;

devno = wdd->cdev.dev;
ret = watchdog_dev_unregister(wdd);
if (ret)
pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);
Expand Down

0 comments on commit f29933d

Please sign in to comment.