From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262947AbVAKXma (ORCPT ); Tue, 11 Jan 2005 18:42:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262941AbVAKXl7 (ORCPT ); Tue, 11 Jan 2005 18:41:59 -0500 Received: from coderock.org ([193.77.147.115]:8902 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S262949AbVAKXfU (ORCPT ); Tue, 11 Jan 2005 18:35:20 -0500 Subject: [patch 07/11] tc/zs: replace schedule_timeout() with msleep_interruptible() To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, domen@coderock.org, nacc@us.ibm.com, janitor@sternwelten.at From: domen@coderock.org Date: Wed, 12 Jan 2005 00:35:11 +0100 Message-Id: <20050111233511.B68811F22A@trashy.coderock.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Any comments would be appreciated. Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer --- kj-domen/drivers/tc/zs.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/tc/zs.c~msleep_interruptible-drivers_tc_zs drivers/tc/zs.c --- kj/drivers/tc/zs.c~msleep_interruptible-drivers_tc_zs 2005-01-10 18:00:13.000000000 +0100 +++ kj-domen/drivers/tc/zs.c 2005-01-10 18:00:13.000000000 +0100 @@ -1395,8 +1395,7 @@ static void rs_close(struct tty_struct * info->tty = 0; if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(info->close_delay); + msleep_interruptible(jiffies_to_msecs(info->close_delay)); } wake_up_interruptible(&info->open_wait); } @@ -1429,8 +1428,7 @@ static void rs_wait_until_sent(struct tt if (timeout) char_time = min_t(unsigned long, char_time, timeout); while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(char_time); + msleep_interruptible(jiffies_to_msecs(char_time)); if (signal_pending(current)) break; if (timeout && time_after(jiffies, orig_jiffies + timeout)) _