git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
media
/
video
/
ovcamchip
/
ovcamchip_core.c
diff --git
a/drivers/media/video/ovcamchip/ovcamchip_core.c
b/drivers/media/video/ovcamchip/ovcamchip_core.c
index
d88956a
..
67f2fc4
100644
(file)
--- a/
drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/
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/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"
#include "ovcamchip_priv.h"
#define DRIVER_VERSION "v2.27 for Linux 2.6"
@@
-128,8
+129,7
@@
static int init_camchip(struct i2c_client *c)
ov_write(c, 0x12, 0x80);
/* Wait for it to initialize */
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) {
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_client *c)
ov_write(c, 0x12, 0x80);
/* Wait for it to initialize */
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);
/* Dummy read to sync I2C */
ov_read(c, 0x00, &low);