diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:27:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:27:49 -0500 |
| commit | 7bbf8ef6902d1e0102a91d22c035622443fd20ca (patch) | |
| tree | 5bdb356bfe2c69fb4deb2801568157c15a9e6aec /drivers | |
| parent | 1ed23743077019e7790234c58e9af678664581df (diff) | |
| parent | 1efd374d78834a793663414402911765bcdda6eb (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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/sbc_fitpc2_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 852ca1977917..91430a89107c 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) | |||
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | err = misc_register(&fitpc2_wdt_miscdev); | 229 | err = misc_register(&fitpc2_wdt_miscdev); |
| 230 | if (!err) { | 230 | if (err) { |
| 231 | pr_err("cannot register miscdev on minor=%d (err=%d)\n", | 231 | pr_err("cannot register miscdev on minor=%d (err=%d)\n", |
| 232 | WATCHDOG_MINOR, err); | 232 | WATCHDOG_MINOR, err); |
| 233 | goto err_margin; | 233 | goto err_margin; |