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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
media
/
video
/
c-qcam.c
diff --git
a/drivers/media/video/c-qcam.c
b/drivers/media/video/c-qcam.c
index
703c4cb
..
bd9fef4
100644
(file)
--- a/
drivers/media/video/c-qcam.c
+++ b/
drivers/media/video/c-qcam.c
@@
-103,7
+103,8
@@
static unsigned int qcam_await_ready1(struct qcam_device *qcam,
{
if (qcam_ready1(qcam) == value)
return 0;
{
if (qcam_ready1(qcam) == value)
return 0;
- msleep_interruptible(100);
+ current->state=TASK_INTERRUPTIBLE;
+ schedule_timeout(HZ/10);
}
/* Probably somebody pulled the plug out. Not much we can do. */
}
/* Probably somebody pulled the plug out. Not much we can do. */
@@
-128,7
+129,8
@@
static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
{
if (qcam_ready2(qcam) == value)
return 0;
{
if (qcam_ready2(qcam) == value)
return 0;
- msleep_interruptible(100);
+ current->state=TASK_INTERRUPTIBLE;
+ schedule_timeout(HZ/10);
}
/* Probably somebody pulled the plug out. Not much we can do. */
}
/* Probably somebody pulled the plug out. Not much we can do. */