From: janitor@sternwelten.at
To: akpm@digeo.com
Cc: linux-kernel@vger.kernel.org, janitor@sternwelten.at, nacc@us.ibm.com
Subject: [patch 19/21] media/saa7134-tvaudio: replace schedule_timeout() with msleep_interruptible()
Date: Thu, 23 Sep 2004 22:32:40 +0200 [thread overview]
Message-ID: <E1CAaGf-0001d2-7R@sputnik> (raw)
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 <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.9-rc2-bk7-max/drivers/media/video/saa7134/saa7134-tvaudio.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/media/video/saa7134/saa7134-tvaudio.c~msleep_interruptible-drivers_media_video_saa7134_saa7134-tvaudio drivers/media/video/saa7134/saa7134-tvaudio.c
--- linux-2.6.9-rc2-bk7/drivers/media/video/saa7134/saa7134-tvaudio.c~msleep_interruptible-drivers_media_video_saa7134_saa7134-tvaudio 2004-09-21 21:17:06.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/media/video/saa7134/saa7134-tvaudio.c 2004-09-21 21:17:06.000000000 +0200
@@ -324,11 +324,12 @@ static int tvaudio_sleep(struct saa7134_
add_wait_queue(&dev->thread.wq, &wait);
if (dev->thread.scan1 == dev->thread.scan2 && !dev->thread.shutdown) {
- set_current_state(TASK_INTERRUPTIBLE);
- if (timeout < 0)
+ if (timeout < 0) {
+ set_current_state(TASK_INTERRUPTIBLE);
schedule();
+ }
else
- schedule_timeout(timeout);
+ msleep_interruptible(jiffies_to_msecs(timeout));
}
remove_wait_queue(&dev->thread.wq, &wait);
return dev->thread.scan1 != dev->thread.scan2;
_
reply other threads:[~2004-09-23 20:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1CAaGf-0001d2-7R@sputnik \
--to=janitor@sternwelten.at \
--cc=akpm@digeo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nacc@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox