Skip to content

Commit

Permalink
watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Denis Turischev authored and Wim Van Sebroeck committed Apr 26, 2010
1 parent fcf1dd7 commit 322af98
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/watchdog/sbc_fitpc2_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 322af98

Please sign in to comment.