Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 430101bd authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: remove ioctl VIDIOC_CROPCAP 



The em28xx driver doesn't support the VIDIOC_G_CROP and VIDIOC_S_CROP ioctls,
so VIDIOC_CROPCAP is useless and has the potential to confuse applications,
because it can be interpreted as indicator for cropping support.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1fe184a6

drivers/media/usb/em28xx/em28xx-video.c

+0 −21
Original line number Diff line number Diff line
@@ -1364,26 +1364,6 @@ static int vidioc_s_register(struct file *file, void *priv, 
#endif





static int vidioc_cropcap(struct file *file, void *priv,

					struct v4l2_cropcap *cc)

{

	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;



	if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	cc->bounds.left = 0;

	cc->bounds.top = 0;

	cc->bounds.width = dev->width;

	cc->bounds.height = dev->height;

	cc->defrect = cc->bounds;

	cc->pixelaspect.numerator = 54;	/* 4:3 FIXME: remove magic numbers */

	cc->pixelaspect.denominator = 59;



	return 0;

}



static int vidioc_querycap(struct file *file, void  *priv,

					struct v4l2_capability *cap)

{
@@ -1731,7 +1711,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_enum_framesizes     = vidioc_enum_framesizes,

	.vidioc_g_audio             = vidioc_g_audio,

	.vidioc_s_audio             = vidioc_s_audio,

	.vidioc_cropcap             = vidioc_cropcap,



	.vidioc_reqbufs             = vb2_ioctl_reqbufs,

	.vidioc_create_bufs         = vb2_ioctl_create_bufs,