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 <[email protected]>
Signed-off-by: Maximilian Attems <[email protected]>
---
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);
_