From 6484156c36fc6d27c8ad54043387fe484dd4b279 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Sun, 24 Jul 2005 19:34:19 -0700 Subject: [PATCH] --- yaml --- r: 4955 b: refs/heads/master c: 70c83375bb47cadd60fdb923ad913d4f4be75aba h: refs/heads/master i: 4953: b5e0b75dc80afb78805f61999d60cbea90ded4c9 4951: 0fcc978973ecc364030260e35f55de393ab807c4 v: v3 --- [refs] | 2 +- trunk/drivers/sbus/char/aurora.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 85818928d284..0fa6fa424b40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4564203d76599973da9c5cbcd93057252414ac9e +refs/heads/master: 70c83375bb47cadd60fdb923ad913d4f4be75aba diff --git a/trunk/drivers/sbus/char/aurora.c b/trunk/drivers/sbus/char/aurora.c index 650d5e924f47..d96cc47de566 100644 --- a/trunk/drivers/sbus/char/aurora.c +++ b/trunk/drivers/sbus/char/aurora.c @@ -1515,8 +1515,7 @@ static void aurora_close(struct tty_struct * tty, struct file * filp) */ timeout = jiffies+HZ; while(port->SRER & SRER_TXEMPTY) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->timeout); + msleep_interruptible(jiffies_to_msecs(port->timeout)); if (time_after(jiffies, timeout)) break; } @@ -1533,8 +1532,7 @@ static void aurora_close(struct tty_struct * tty, struct file * filp) port->tty = 0; if (port->blocked_open) { if (port->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->close_delay); + msleep_interruptible(jiffies_to_msecs(port->close_delay)); } wake_up_interruptible(&port->open_wait); }