From: janitor@sternwelten.at
To: akpm@digeo.com
Cc: linux-kernel@vger.kernel.org, janitor@sternwelten.at, nacc@us.ibm.com
Subject: [patch 12/21] media/cx88-video: replace schedule_timeout() with msleep_interruptible()
Date: Thu, 23 Sep 2004 22:32:21 +0200 [thread overview]
Message-ID: <E1CAaGL-0001Kd-VK@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/cx88/cx88-video.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/media/video/cx88/cx88-video.c~msleep_interruptible-drivers_media_video_cx88_cx88-video drivers/media/video/cx88/cx88-video.c
--- linux-2.6.9-rc2-bk7/drivers/media/video/cx88/cx88-video.c~msleep_interruptible-drivers_media_video_cx88_cx88-video 2004-09-21 21:16:58.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/media/video/cx88/cx88-video.c 2004-09-21 21:16:58.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
+#include <linux/delay.h>
#include <asm/div64.h>
#include "cx88.h"
@@ -476,8 +477,7 @@ static int set_pll(struct cx8800_dev *de
return 0;
}
dprintk(1,"pll not locked yet, waiting ...\n");
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep_interruptible(100);
}
dprintk(1,"pll NOT locked [pre=%d,ofreq=%d]\n",prescale,ofreq);
return -1;
@@ -2237,8 +2237,7 @@ static int cx8800_reset(struct cx8800_de
cx_write(MO_INT1_STAT, 0xFFFFFFFF); // Clear RISC int
/* wait a bit */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep_interruptible(100);
/* init sram */
cx88_sram_channel_setup(dev, &cx88_sram_channels[SRAM_CH21], 720*4, 0);
_
reply other threads:[~2004-09-24 1:37 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=E1CAaGL-0001Kd-VK@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