diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:26:13 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:26:13 -0300 |
commit | 7921b528872c180d255e21140cd54502dda70a7a (patch) | |
tree | 4fd9adef130ee33e885254b9b5042033b1bc21c9 /linux/drivers/media/video/zc0301 | |
parent | 45d1e795c057e023fc615bedc55da461dfbdaef3 (diff) | |
parent | c3f603f1ba42f82cfb30e06f08d35cf672e90147 (diff) | |
download | mediapointer-dvb-s2-7921b528872c180d255e21140cd54502dda70a7a.tar.gz mediapointer-dvb-s2-7921b528872c180d255e21140cd54502dda70a7a.tar.bz2 |
merge: http://linuxtv.org/hg/~eandren/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zc0301')
-rw-r--r-- | linux/drivers/media/video/zc0301/zc0301_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/zc0301/zc0301_core.c b/linux/drivers/media/video/zc0301/zc0301_core.c index b6a3ac815..996cf0c41 100644 --- a/linux/drivers/media/video/zc0301/zc0301_core.c +++ b/linux/drivers/media/video/zc0301/zc0301_core.c @@ -823,8 +823,10 @@ zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos) (!list_empty(&cam->outqueue)) || (cam->state & DEV_DISCONNECTED) || (cam->state & DEV_MISCONFIGURED), - cam->module_param.frame_timeout * - 1000 * msecs_to_jiffies(1) ); + msecs_to_jiffies( + cam->module_param.frame_timeout * 1000 + ) + ); if (timeout < 0) { mutex_unlock(&cam->fileop_mutex); return timeout; |