The patch number 8161 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]>
gspca: Fix compilation
Some callbacks were renamed. Fix it.
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/gspca/gspca.c | 27 ++++++++++--------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff -r 92f844f35c39 -r 1022101ca34c linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Tue Jul 01 00:49:18 2008 -0300
+++ b/linux/drivers/media/video/gspca/gspca.c Tue Jul 01 01:06:22 2008 -0300
@@ -745,7 +745,7 @@ static int gspca_get_mode(struct gspca_d
return -EINVAL;
}
-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 *fmtdesc)
{
struct gspca_dev *gspca_dev = priv;
@@ -788,7 +788,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 *fmt)
{
struct gspca_dev *gspca_dev = priv;
@@ -817,7 +817,7 @@ static int vidioc_g_fmt_cap(struct file
return 0;
}
-static int try_fmt_cap(struct gspca_dev *gspca_dev,
+static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
struct v4l2_format *fmt)
{
int w, h, mode, mode2, frsz;
@@ -871,20 +871,20 @@ static int try_fmt_cap(struct gspca_dev
return mode; /* used when s_fmt */
}
-static int vidioc_try_fmt_cap(struct file *file,
+static int vidioc_try_fmt_vid_cap(struct file *file,
void *priv,
struct v4l2_format *fmt)
{
struct gspca_dev *gspca_dev = priv;
int ret;
- ret = try_fmt_cap(gspca_dev, fmt);
+ ret = try_fmt_vid_cap(gspca_dev, fmt);
if (ret < 0)
return ret;
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 *fmt)
{
struct gspca_dev *gspca_dev = priv;
@@ -910,7 +910,7 @@ static int vidioc_s_fmt_cap(struct file
if (mutex_lock_interruptible(&gspca_dev->queue_lock))
return -ERESTARTSYS;
- ret = try_fmt_cap(gspca_dev, fmt);
+ ret = try_fmt_vid_cap(gspca_dev, fmt);
if (ret < 0)
goto out;
@@ -1375,7 +1375,7 @@ static int vidiocgmbuf(struct file *file
fmt.fmt.pix.width = gspca_dev->cam.cam_mode[i].width;
fmt.fmt.pix.height = gspca_dev->cam.cam_mode[i].height;
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
- ret = vidioc_s_fmt_cap(file, priv, &fmt);
+ ret = vidioc_s_fmt_vid_cap(file, priv, &fmt);
if (ret != 0)
return ret;
}
@@ -1845,19 +1845,16 @@ static struct video_device gspca_templat
static struct video_device gspca_template = {
.name = "gspca main driver",
.type = VID_TYPE_CAPTURE,
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
- .hardware = 0xff,
-#endif
.fops = &dev_fops,
.release = dev_release, /* mandatory */
.minor = -1,
.vidioc_querycap = vidioc_querycap,
.vidioc_dqbuf = vidioc_dqbuf,
.vidioc_qbuf = vidioc_qbuf,
- .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap,
- .vidioc_try_fmt_cap = vidioc_try_fmt_cap,
- .vidioc_g_fmt_cap = vidioc_g_fmt_cap,
- .vidioc_s_fmt_cap = vidioc_s_fmt_cap,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+ .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+ .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
+ .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
.vidioc_streamon = vidioc_streamon,
.vidioc_queryctrl = vidioc_queryctrl,
.vidioc_g_ctrl = vidioc_g_ctrl,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1022101ca34c7e6ef8a399abc3b7cc100fa81e23
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
