system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 10:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] gspca: Use the global error status for get/set streamparm

Browse source 
Also, in ov534, don't check the parm type.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-François Moine 2010-12-25 13:46:14 -03:00 committed by Mauro Carvalho Chehab
parent 76ebc16b87
commit 668f44a603
3 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/media/video/gspca/gspca.c
View file

@ -1708,12 +1708,13 @@ static int vidioc_g_parm(struct file *filp, void *priv,
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
gspca_dev->usb_err = 0; if (gspca_dev->present) {
if (gspca_dev->present) gspca_dev->usb_err = 0;
ret = gspca_dev->sd_desc->get_streamparm(gspca_dev, gspca_dev->sd_desc->get_streamparm(gspca_dev, parm);
parm); ret = gspca_dev->usb_err;
else } else {
ret = -ENODEV; ret = -ENODEV;
}
mutex_unlock(&gspca_dev->usb_lock); mutex_unlock(&gspca_dev->usb_lock);
return ret; return ret;
} }
@ -1738,12 +1739,13 @@ static int vidioc_s_parm(struct file *filp, void *priv,
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
gspca_dev->usb_err = 0; if (gspca_dev->present) {
if (gspca_dev->present) gspca_dev->usb_err = 0;
ret = gspca_dev->sd_desc->set_streamparm(gspca_dev, gspca_dev->sd_desc->set_streamparm(gspca_dev, parm);
parm); ret = gspca_dev->usb_err;
else } else {
ret = -ENODEV; ret = -ENODEV;
}
mutex_unlock(&gspca_dev->usb_lock); mutex_unlock(&gspca_dev->usb_lock);
return ret; return ret;
} }

2
drivers/media/video/gspca/gspca.h
View file

@ -93,7 +93,7 @@ typedef int (*cam_reg_op) (struct gspca_dev *,
struct v4l2_dbg_register *); struct v4l2_dbg_register *);
typedef int (*cam_ident_op) (struct gspca_dev *, typedef int (*cam_ident_op) (struct gspca_dev *,
struct v4l2_dbg_chip_ident *); struct v4l2_dbg_chip_ident *);
typedef int (*cam_streamparm_op) (struct gspca_dev *, typedef void (*cam_streamparm_op) (struct gspca_dev *,
struct v4l2_streamparm *); struct v4l2_streamparm *);
typedef int (*cam_qmnu_op) (struct gspca_dev *, typedef int (*cam_qmnu_op) (struct gspca_dev *,
struct v4l2_querymenu *); struct v4l2_querymenu *);

14
drivers/media/video/gspca/ov534.c
View file

@ -1243,34 +1243,26 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
} }
/* get stream parameters (framerate) */ /* get stream parameters (framerate) */
static int sd_get_streamparm(struct gspca_dev *gspca_dev, static void sd_get_streamparm(struct gspca_dev *gspca_dev,
struct v4l2_streamparm *parm) struct v4l2_streamparm *parm)
{ {
struct v4l2_captureparm *cp = &parm->parm.capture; struct v4l2_captureparm *cp = &parm->parm.capture;
struct v4l2_fract *tpf = &cp->timeperframe; struct v4l2_fract *tpf = &cp->timeperframe;
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
cp->capability |= V4L2_CAP_TIMEPERFRAME; cp->capability |= V4L2_CAP_TIMEPERFRAME;
tpf->numerator = 1; tpf->numerator = 1;
tpf->denominator = sd->frame_rate; tpf->denominator = sd->frame_rate;
return 0;
} }
/* set stream parameters (framerate) */ /* set stream parameters (framerate) */
static int sd_set_streamparm(struct gspca_dev *gspca_dev, static void sd_set_streamparm(struct gspca_dev *gspca_dev,
struct v4l2_streamparm *parm) struct v4l2_streamparm *parm)
{ {
struct v4l2_captureparm *cp = &parm->parm.capture; struct v4l2_captureparm *cp = &parm->parm.capture;
struct v4l2_fract *tpf = &cp->timeperframe; struct v4l2_fract *tpf = &cp->timeperframe;
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
/* Set requested framerate */ /* Set requested framerate */
sd->frame_rate = tpf->denominator / tpf->numerator; sd->frame_rate = tpf->denominator / tpf->numerator;
if (gspca_dev->streaming) if (gspca_dev->streaming)
@ -1279,8 +1271,6 @@ static int sd_set_streamparm(struct gspca_dev *gspca_dev,
/* Return the actual framerate */ /* Return the actual framerate */
tpf->numerator = 1; tpf->numerator = 1;
tpf->denominator = sd->frame_rate; tpf->denominator = sd->frame_rate;
return 0;
} }
/* sub-driver description */ /* sub-driver description */