diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 00:49:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 00:49:16 -0300 |
| commit | 17121266ba0f4c8301345866b3fe36b05cb82ad6 (patch) | |
| tree | 280955dd1de6facf04f97280a545273e435c9ef7 | |
| parent | 78a6eb45bbd3dfed11a9ac8287a6060464eba7ba (diff) | |
| parent | 798185861c11b8c26c0494e459d1b7811d2c228e (diff) | |
| download | mediapointer-dvb-s2-17121266ba0f4c8301345866b3fe36b05cb82ad6.tar.gz mediapointer-dvb-s2-17121266ba0f4c8301345866b3fe36b05cb82ad6.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/zoran/zoran_driver.c | 9 | ||||
| -rw-r--r-- | v4l/compat.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c index 8eda83b06..1560c1e4c 100644 --- a/linux/drivers/media/video/zoran/zoran_driver.c +++ b/linux/drivers/media/video/zoran/zoran_driver.c @@ -1378,11 +1378,10 @@ setup_overlay (struct file *file, /* get the status of a buffer in the clients buffer queue */ static int -zoran_v4l2_buffer_status (struct file *file, +zoran_v4l2_buffer_status (struct zoran_fh *fh, struct v4l2_buffer *buf, int num) { - struct zoran_fh *fh = file->private_data; struct zoran *zr = fh->zr; buf->flags = V4L2_BUF_FLAG_MAPPED; @@ -2502,7 +2501,7 @@ static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf int res; mutex_lock(&zr->resource_lock); - res = zoran_v4l2_buffer_status(file, buf, buf->index); + res = zoran_v4l2_buffer_status(fh, buf, buf->index); mutex_unlock(&zr->resource_lock); return res; @@ -2603,7 +2602,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf) if (res) goto dqbuf_unlock_and_return; zr->v4l_sync_tail++; - res = zoran_v4l2_buffer_status(file, buf, num); + res = zoran_v4l2_buffer_status(fh, buf, num); break; case ZORAN_MAP_MODE_JPG_REC: @@ -2634,7 +2633,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf) res = jpg_sync(file, &bs); if (res) goto dqbuf_unlock_and_return; - res = zoran_v4l2_buffer_status(file, buf, bs.frame); + res = zoran_v4l2_buffer_status(fh, buf, bs.frame); break; } diff --git a/v4l/compat.h b/v4l/compat.h index 3df844c87..44878ce73 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -11,6 +11,7 @@ * delayed_work in the same context as something named work_struct. */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #define delayed_work work_struct +#define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) |