Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…
Browse files Browse the repository at this point in the history
…chdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] SBC-FITPC2 watchdog driver registration fix
  • Loading branch information
Linus Torvalds committed Nov 11, 2009
2 parents 1ed2374 + 1efd374 commit 7bbf8ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/sbc_fitpc2_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static int __init fitpc2_wdt_init(void)
}

err = misc_register(&fitpc2_wdt_miscdev);
if (!err) {
if (err) {
pr_err("cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, err);
goto err_margin;
Expand Down

0 comments on commit 7bbf8ef

Please sign in to comment.