"scheduling while atomic" bug in SBC-FITPC2 watchdog

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Denis Turischev
Date: Thursday, April 22, 2010 - 9:54 am

sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.

speenlock need to be replaced by mutex because of sleep functions
inside wdt_send_data.

Signed-off-by: Denis Turischev <denis@compulab.co.il>
---
 drivers/watchdog/sbc_fitpc2_wdt.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 226f0f2..23da5cb 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -30,7 +30,7 @@
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned int margin = 60;	/* (secs) Default is 1 minute */
 static unsigned long wdt_status;
-static DEFINE_SPINLOCK(wdt_lock);
+static DEFINE_MUTEX(wdt_lock);

 #define WDT_IN_USE		0
 #define WDT_OK_TO_CLOSE		1
@@ -53,18 +53,18 @@ static void wdt_send_data(unsigned char command, unsigned char data)

 static void wdt_enable(void)
 {
-	spin_lock(&wdt_lock);
+	mutex_lock(&wdt_lock);
 	wdt_send_data(IFACE_ON_COMMAND, 1);
 	wdt_send_data(REBOOT_COMMAND, margin);
-	spin_unlock(&wdt_lock);
+	mutex_unlock(&wdt_lock);
 }

 static void wdt_disable(void)
 {
-	spin_lock(&wdt_lock);
+	mutex_lock(&wdt_lock);
 	wdt_send_data(IFACE_ON_COMMAND, 0);
 	wdt_send_data(REBOOT_COMMAND, 0);
-	spin_unlock(&wdt_lock);
+	mutex_unlock(&wdt_lock);
 }

 static int fitpc2_wdt_open(struct inode *inode, struct file *file)
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] add SBC-FITPC2 watchdog driver, Mike Rapoport, (Mon Jul 20, 8:53 am)
Re: [PATCH] add SBC-FITPC2 watchdog driver, Joe Perches, (Mon Jul 20, 9:43 am)
[PATCH 0/3] drivers/watchdog: Use pr_&lt;level&gt;, Joe Perches, (Mon Jul 20, 9:34 pm)
[PATCH 3/3] drivers/watchdog: use pr_fmt, Joe Perches, (Mon Jul 20, 9:35 pm)
SBC-FITPC2 watchdog driver fix, Denis Turischev, (Thu Nov 5, 4:32 am)
Re: SBC-FITPC2 watchdog driver fix, Wim Van Sebroeck, (Thu Nov 5, 4:51 am)
SBC-FITPC2 watchdog driver fix, Denis Turischev, (Thu Jan 21, 7:10 am)
I/O operations order fix for SBC-FITPC2 watchdog, Denis Turischev, (Thu Apr 22, 9:50 am)
"scheduling while atomic" bug in SBC-FITPC2 watchdog, Denis Turischev, (Thu Apr 22, 9:54 am)