The patch number 8139 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
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:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Fix callback names
Callback naming has changed. Fix to the proper convention.
CC: Dean Anderson <[EMAIL PROTECTED]>
CC: Greg Kroah-Hartman <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/s2255drv.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -r 4260d7ff0099 -r 34c3d4dda762 linux/drivers/media/video/s2255drv.c
--- a/linux/drivers/media/video/s2255drv.c Sat Jun 28 14:20:12 2008 -0300
+++ b/linux/drivers/media/video/s2255drv.c Sat Jun 28 14:42:20 2008 -0300
@@ -812,7 +812,7 @@ static int vidioc_querycap(struct file *
return 0;
}
-static int vidioc_enum_fmt_cap(struct file *file, void *priv,
+static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f)
{
int index = 0;
@@ -828,7 +828,7 @@ static int vidioc_enum_fmt_cap(struct fi
return 0;
}
-static int vidioc_g_fmt_cap(struct file *file, void *priv,
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct s2255_fh *fh = priv;
@@ -843,7 +843,7 @@ static int vidioc_g_fmt_cap(struct file
return (0);
}
-static int vidioc_try_fmt_cap(struct file *file, void *priv,
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
const struct s2255_fmt *fmt;
@@ -949,7 +949,7 @@ static int vidioc_try_fmt_cap(struct fil
return 0;
}
-static int vidioc_s_fmt_cap(struct file *file, void *priv,
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
struct s2255_fh *fh = priv;
@@ -958,7 +958,7 @@ static int vidioc_s_fmt_cap(struct file
int ret;
int norm;
- ret = vidioc_try_fmt_cap(file, fh, f);
+ ret = vidioc_try_fmt_vid_cap(file, fh, f);
if (ret < 0)
return (ret);
@@ -1656,10 +1656,10 @@ static struct video_device template = {
.minor = -1,
.release = video_device_release,
.vidioc_querycap = vidioc_querycap,
- .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap,
- .vidioc_g_fmt_cap = vidioc_g_fmt_cap,
- .vidioc_try_fmt_cap = vidioc_try_fmt_cap,
- .vidioc_s_fmt_cap = vidioc_s_fmt_cap,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+ .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+ .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+ .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_reqbufs = vidioc_reqbufs,
.vidioc_querybuf = vidioc_querybuf,
.vidioc_qbuf = vidioc_qbuf,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/34c3d4dda762a7fef8fe1ee04ff431c64197e138
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
