diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-28 18:25:35 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-28 18:25:35 -0700 |
| commit | 57f3110ab60dcf436b20b31c6e7764f0024040ca (patch) | |
| tree | b9eef6f920e74aa076ae6e344fcbadbc6796c4ff | |
| parent | 5d25c814ad864544eb0e58593cadc604618a852c (diff) | |
| download | mediapointer-dvb-s2-57f3110ab60dcf436b20b31c6e7764f0024040ca.tar.gz mediapointer-dvb-s2-57f3110ab60dcf436b20b31c6e7764f0024040ca.tar.bz2 | |
gspca: Stop setting buffer type, and avoid memset in querycap
From: Trent Piepho <xyzzy@speakeasy.org>
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.
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
CC: Jean-Francois Moine <moinejf@free.fr>
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 88de8b865..93c35d083 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -777,7 +777,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; @@ -974,8 +973,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; @@ -1353,7 +1350,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) { |