From eb0fa0d830c7efa01200d1185c739d7a7dfcb015 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 29 Jun 2009 18:00:39 +0200
Subject: [PATCH] --- yaml --- r: 155163 b: refs/heads/master c:
 db5d2d8a5dfe0ae3e83ac618fd953ecc621adcdf h: refs/heads/master i:   155161:
 b9208a5afcdcd1af92ef0d1ecd5b190cb6300255   155159:
 34f9d065a05c702125d25100049ece0e8e356d7b v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/watchdog/w83697ug_wdt.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7b68439c4a8..e8e953e5eaba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b86a6c6c7b0bfc26b3e8d4f48e16ee0b13716385
+refs/heads/master: db5d2d8a5dfe0ae3e83ac618fd953ecc621adcdf
diff --git a/trunk/drivers/watchdog/w83697ug_wdt.c b/trunk/drivers/watchdog/w83697ug_wdt.c
index 883b5f79673a..a6c12dec91a1 100644
--- a/trunk/drivers/watchdog/w83697ug_wdt.c
+++ b/trunk/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 */