watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.
authorDenis Turischev <denis@compulab.co.il>
Thu, 22 Apr 2010 16:54:20 +0000 (19:54 +0300)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 26 Apr 2010 18:22:30 +0000 (18:22 +0000)
spinlock need to be replaced by mutex because of sleep functions
inside wdt_send_data.

Signed-off-by: Denis Turischev <denis@compulab.co.il>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/sbc_fitpc2_wdt.c

index 2e44dd4e7c1baa70a06a0002fb2cd68670b0683c..c7d67e9a74659bc004abd8ba64b39426003cf788 100644 (file)
@@ -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)