aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-11 11:27:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-11 11:27:49 -0800
commit7bbf8ef6902d1e0102a91d22c035622443fd20ca (patch)
tree5bdb356bfe2c69fb4deb2801568157c15a9e6aec
parent1ed23743077019e7790234c58e9af678664581df (diff)
parent1efd374d78834a793663414402911765bcdda6eb (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] SBC-FITPC2 watchdog driver registration fix
-rw-r--r--drivers/watchdog/sbc_fitpc2_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 852ca197791..91430a89107 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -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;