diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-01 01:06:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-01 01:06:22 -0300 |
| commit | 0734cd1feeb40b66d38bd7ebc7a88549a5895e4e (patch) | |
| tree | 19e1910c2af4ae379a92f49caec06afe132f3bc0 | |
| parent | 2b7963148161ef52cd30dcaee4d2e85d15675640 (diff) | |
| download | mediapointer-dvb-s2-0734cd1feeb40b66d38bd7ebc7a88549a5895e4e.tar.gz mediapointer-dvb-s2-0734cd1feeb40b66d38bd7ebc7a88549a5895e4e.tar.bz2 | |
gspca: Fix compilation
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Some callbacks were renamed. Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 12639413c..31132ea61 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -745,7 +745,7 @@ static int gspca_get_mode(struct gspca_dev *gspca_dev, 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 file *file, void *priv, 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 *file, void *priv, 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 *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 *file, void *priv, 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, void *priv, 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 file_operations dev_fops = { 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, |