The patch number 10849 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://linuxtv.org/hg/~tap/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/zoran/zoran_driver.c | 9 ++++-----
v4l/compat.h | 1 +
2 files changed, 5 insertions(+), 5 deletions(-)
diff -r a73e9cf6cd5c -r 4f0dae5b5afb
linux/drivers/media/video/zoran/zoran_driver.c
--- a/linux/drivers/media/video/zoran/zoran_driver.c Sun Mar 08 23:01:08
2009 -0300
+++ b/linux/drivers/media/video/zoran/zoran_driver.c Mon Mar 09 00:49:16
2009 -0300
@@ -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 *f
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
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
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 -r a73e9cf6cd5c -r 4f0dae5b5afb v4l/compat.h
--- a/v4l/compat.h Sun Mar 08 23:01:08 2009 -0300
+++ b/v4l/compat.h Mon Mar 09 00:49:16 2009 -0300
@@ -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)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/4f0dae5b5afb5afe353a510e5cd010ea78aa48b0
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
