aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-11 03:34:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:18 -0400
commitd8cd5e6c240bb3ff55e42afaa446c178ef8bb403 (patch)
treec4f20615ac3fe9badcf729a8c438cf9f85b7a152 /drivers/media/video
parentab84f5736086b84d99015cd82515a31b95e03f48 (diff)
V4L/DVB (10960): omap24xxcam: don't set vfl_type.
The vfl_type field is set by the core, so anything you fill in here will be overwritten. And it will be set to a VFL_TYPE_ value, not a VID_TYPE_ value which is an obsolete V4L1 type. Since these V4L1 types have been made unavailable for V4L2 drivers, this driver stopped compiling. In this case the fix is just removing this assignment. Cc: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/omap24xxcam.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 805faaea6449..2cea7fee9b51 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -1665,7 +1665,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
1665 vfd->parent = cam->dev; 1665 vfd->parent = cam->dev;
1666 1666
1667 strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name)); 1667 strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
1668 vfd->vfl_type = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
1669 vfd->fops = &omap24xxcam_fops; 1668 vfd->fops = &omap24xxcam_fops;
1670 vfd->minor = -1; 1669 vfd->minor = -1;
1671 vfd->ioctl_ops = &omap24xxcam_ioctl_fops; 1670 vfd->ioctl_ops = &omap24xxcam_ioctl_fops;