summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorDenis Turischev <denis@compulab.co.il>2010-04-22 19:54:20 +0300
committerWim Van Sebroeck <wim@iguana.be>2010-04-26 18:22:30 +0000
commit322af98c56c70b3ec6f637fb07d41a9591a6ff9a (patch)
tree45ad10b5731f76fffc6cc7c94af254340ff29409 /drivers/watchdog
parentfcf1dd7e68ceb6420478c8d89d35b4745d0b2f42 (diff)
downloadop-kernel-dev-322af98c56c70b3ec6f637fb07d41a9591a6ff9a.zip
op-kernel-dev-322af98c56c70b3ec6f637fb07d41a9591a6ff9a.tar.gz
watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.
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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/sbc_fitpc2_wdt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 2e44dd4..c7d67e9 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)
OpenPOWER on IntegriCloud