media/ovcamchip_core: replace schedule_timeout() with msleep()

PATCH New [email protected] 1 participant 1 message Sep 24, 2004 Media (V4L/DVB)

lore

Share & tools

lore

[email protected]

author

2004-09-24 03:48 UTC #0 lore raw

PATCH 5/21 media/ovcamchip_core: replace schedule_timeout() with msleep()

Any comments would be appreciated.

Description: Use msleep() 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/ovcamchip/ovcamchip_core.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

drivers/media/video/ovcamchip/ovcamchip_core.c renamed from drivers/media/video/ovcamchip/ovcamchip_core.c~msleep-drivers_media_video_ovcamchip_ovcamchip_core +3 -4

diff -puN drivers/media/video/ovcamchip/ovcamchip_core.c~msleep-drivers_media_video_ovcamchip_ovcamchip_core drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include "ovcamchip_priv.h"
 
 #define DRIVER_VERSION "v2.27 for Linux 2.6"

@@ -128,8 +129,7 @@ static int init_camchip(struct i2c_clien
 	ov_write(c, 0x12, 0x80);
 
 	/* Wait for it to initialize */
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(1 + 150 * HZ / 1000);
+	msleep(150);
 
 	for (i = 0, success = 0; i < I2C_DETECT_RETRIES && !success; i++) {
 		if (ov_read(c, GENERIC_REG_ID_HIGH, &high) >= 0) {

@@ -145,8 +145,7 @@ static int init_camchip(struct i2c_clien
 		ov_write(c, 0x12, 0x80);
 
 		/* Wait for it to initialize */
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(1 + 150 * HZ / 1000);
+		msleep(150);
 
 		/* Dummy read to sync I2C */
 		ov_read(c, 0x00, &low);