diff options
| author |   Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 09:44:53 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:38:21 -0200 |
| commit | a2c8c68cca3dbb0c87f5034ab8ea29350174ec4a (patch) | |
| tree | ec5aa7c75e6bfeaec6fc365d47941dbb18cda098 /drivers/media/video/soc_camera.c | |
| parent | V4L/DVB (9784): Register name fix for ov772x driver (diff) | |
| download | linux-dev-a2c8c68cca3dbb0c87f5034ab8ea29350174ec4a.tar.xz linux-dev-a2c8c68cca3dbb0c87f5034ab8ea29350174ec4a.zip | |
V4L/DVB (9785): soc-camera: merge .try_bus_param() into .try_fmt_cap()
.try_bus_param() method from struct soc_camera_host_ops is only called at one
location immediately before .try_fmt_cap(), there is no value in keeping these
two methods separate, merge them.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 28cf5c94bd61..2ebdf4d667e3 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -77,11 +77,6 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, return -EINVAL; } - /* test physical bus parameters */ - ret = ici->ops->try_bus_param(icd, f->fmt.pix.pixelformat); - if (ret) - return ret; - /* limit format to hardware capabilities */ ret = ici->ops->try_fmt_cap(icd, f); |