V4L/DVB (10960): omap24xxcam: don't set vfl_type.
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 11 Mar 2009 07:34:09 +0000 (04:34 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:18 +0000 (12:43 -0300)
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>
drivers/media/video/omap24xxcam.c

index 805faaea64498a97061f3db0f85ac454e4525201..2cea7fee9b5183003a4b037e05f3b4e6177e608b 100644 (file)
@@ -1665,7 +1665,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
        vfd->parent = cam->dev;
 
        strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
-       vfd->vfl_type            = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
        vfd->fops                = &omap24xxcam_fops;
        vfd->minor               = -1;
        vfd->ioctl_ops           = &omap24xxcam_ioctl_fops;