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

Commit 5a275786 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11263): gspca: Stop setting buffer type, and avoid memset in querycap 



The v4l2-ioctl core checks the buffer type now by only allowing buffer
types for which the corresponding ->vidioc_try_fmt_xxx() methods are
defined.

This driver only defines ->vidioc_try_fmt_vid_cap() so only VIDEO_CAPTURE
buffers are allowed to be used with vidioc_g_parm.  Also,
->vidioc_enum_fmt_vid_cap() is only called for VIDEO_CAPTURE buffers.
There is no need to set the buffer type since it must already be the
correct value.

The struct which ->vidioc_querycap() is supposed to fill in is already
zeroed so it's not necessary to call memset on it.

Cc: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 601bc298

drivers/media/video/gspca/gspca.c

+0 −4
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, 
	fmtdesc->pixelformat = fmt_tb[index];

	if (gspca_is_compressed(fmt_tb[index]))

		fmtdesc->flags = V4L2_FMT_FLAG_COMPRESSED;

	fmtdesc->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	fmtdesc->description[0] = fmtdesc->pixelformat & 0xff;

	fmtdesc->description[1] = (fmtdesc->pixelformat >> 8) & 0xff;

	fmtdesc->description[2] = (fmtdesc->pixelformat >> 16) & 0xff;
@@ -962,8 +961,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	struct gspca_dev *gspca_dev = priv;

	int ret;



	memset(cap, 0, sizeof *cap);



	/* protect the access to the usb device */

	if (mutex_lock_interruptible(&gspca_dev->usb_lock))

		return -ERESTARTSYS;
@@ -1341,7 +1338,6 @@ static int vidioc_g_parm(struct file *filp, void *priv, 
{

	struct gspca_dev *gspca_dev = priv;



	parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	parm->parm.capture.readbuffers = gspca_dev->nbufread;



	if (gspca_dev->sd_desc->get_streamparm) {