git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
watchdog
/
w83697ug_wdt.c
diff --git
a/drivers/watchdog/w83697ug_wdt.c
b/drivers/watchdog/w83697ug_wdt.c
index
883b5f7
..
a6c12de
100644
(file)
--- a/
drivers/watchdog/w83697ug_wdt.c
+++ b/
drivers/watchdog/w83697ug_wdt.c
@@
-149,8
+149,10
@@
static void wdt_ctrl(int timeout)
{
spin_lock(&io_lock);
- if (w83697ug_select_wd_register() < 0)
+ if (w83697ug_select_wd_register() < 0) {
+ spin_unlock(&io_lock);
return;
+ }
outb_p(0xF4, WDT_EFER); /* Select CRF4 */
outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */