Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164224
b: refs/heads/master
c: a12222a
h: refs/heads/master
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent 9e9be00 commit 6540c07
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cca0e54905259a456d97652d4f1e2fe8b188b6ad
refs/heads/master: a12222a73e7a9efd927eb99d1dec1cedc9887e0a
7 changes: 2 additions & 5 deletions trunk/drivers/media/video/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,9 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)
{
struct soc_camera_file *icf = file->private_data;
struct soc_camera_device *icd = icf->icd;
int ret = 0;

if (icd->ops->set_std)
ret = icd->ops->set_std(icd, a);
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);

return ret;
return v4l2_device_call_until_err(&ici->v4l2_dev, (__u32)icd, core, s_std, *a);
}

static int soc_camera_reqbufs(struct file *file, void *priv,
Expand Down
1 change: 0 additions & 1 deletion trunk/include/media/soc_camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ struct soc_camera_ops {
int (*set_bus_param)(struct soc_camera_device *, unsigned long);
int (*get_chip_id)(struct soc_camera_device *,
struct v4l2_dbg_chip_ident *);
int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
const struct v4l2_queryctrl *controls;
int num_controls;
Expand Down

0 comments on commit 6540c07

Please sign in to comment.