From 64b964709c0cfd317f84002b6c6d9903b02768dc Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Tue, 23 Oct 2007 03:08:27 +0200
Subject: [PATCH] --- yaml --- r: 72998 b: refs/heads/master c:
 2ba7d7b39f3adf3f71aa3acab00111a429056c7d h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/iTCO_wdt.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b2c931ec377f..ebd44c7f49e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59338d4cb68528062f294d95f116357265936076
+refs/heads/master: 2ba7d7b39f3adf3f71aa3acab00111a429056c7d
diff --git a/trunk/drivers/watchdog/iTCO_wdt.c b/trunk/drivers/watchdog/iTCO_wdt.c
index cd5a565bc3a0..185c093a8591 100644
--- a/trunk/drivers/watchdog/iTCO_wdt.c
+++ b/trunk/drivers/watchdog/iTCO_wdt.c
@@ -300,6 +300,7 @@ static int iTCO_wdt_start(void)
 
 	/* disable chipset's NO_REBOOT bit */
 	if (iTCO_wdt_unset_NO_REBOOT_bit()) {
+		spin_unlock(&iTCO_wdt_private.io_lock);
 		printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
 		return -EIO;
 	}