From: Hari Prasath Gujulan Elango Date: Mon, 8 Feb 2016 06:39:21 +0000 (+0000) Subject: staging: dgnc: convert to wait_event_interruptible_timeout X-Git-Tag: android-x86-7.1-r1~1876^2~952 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=127bf16602c47ed3c6b5ee619ac101316ea9b972;p=android-x86%2Fkernel.git staging: dgnc: convert to wait_event_interruptible_timeout This patch makes use of wait_event_interruptible_timeout to achieve timeout functionality.This is a TODO mentiond in the comment which is also removed.It also aligns with what the function is supposed to do as in the comments. Signed-off-by: Hari Prasath Gujulan Elango Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c index 39c76e78e56a..ee3155bcc6d2 100644 --- a/drivers/staging/dgnc/dgnc_neo.c +++ b/drivers/staging/dgnc/dgnc_neo.c @@ -1306,10 +1306,10 @@ static int neo_drain(struct tty_struct *tty, uint seconds) /* * Go to sleep waiting for the tty layer to wake me back up when * the empty flag goes away. - * - * NOTE: TODO: Do something with time passed in. */ - rc = wait_event_interruptible(un->un_flags_wait, ((un->un_flags & UN_EMPTY) == 0)); + rc = wait_event_interruptible_timeout(un->un_flags_wait, + ((un->un_flags & UN_EMPTY) == 0), + msecs_to_jiffies(seconds * 1000)); /* If ret is non-zero, user ctrl-c'ed us */ return rc;