OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b86a6c6
)
[WATCHDOG] w83697ug, fix lock imbalance
author
Jiri Slaby
<jirislaby@gmail.com>
Mon, 29 Jun 2009 16:00:39 +0000
(18:00 +0200)
committer
Wim Van Sebroeck
<wim@iguana.be>
Thu, 9 Jul 2009 18:29:16 +0000
(18:29 +0000)
Don't forget to unlock io_lock when w83697ug_select_wd_register fails in
wdt_ctrl.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/w83697ug_wdt.c
patch
|
blob
|
history
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 */