diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 05:36:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 09:34:57 -0300 |
| commit | 2766a7a99950b5a0033b449dacc04070654b0357 (patch) | |
| tree | 923aa1cf83729ee967bb22f6f8a2e0fa18cb42dc | |
| parent | 5d40810812af73c812613638140c75d351422d9d (diff) | |
| download | op-kernel-dev-2766a7a99950b5a0033b449dacc04070654b0357.zip op-kernel-dev-2766a7a99950b5a0033b449dacc04070654b0357.tar.gz | |
[media] soc_camera: remove use of current_norm
The current_norm field is deprecated, so don't set it. Since it is set to
V4L2_STD_UNKNOWN which is 0 it didn't do anything anyway.
Also remove a few other unnecessary uses of V4L2_STD_UNKNOWN.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/platform/soc_camera/soc_camera.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 68efade..0252fbb 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -235,7 +235,6 @@ static int soc_camera_enum_input(struct file *file, void *priv, /* default is camera */ inp->type = V4L2_INPUT_TYPE_CAMERA; - inp->std = V4L2_STD_UNKNOWN; strcpy(inp->name, "Camera"); return 0; @@ -1479,11 +1478,9 @@ static int video_dev_create(struct soc_camera_device *icd) strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name)); vdev->parent = icd->pdev; - vdev->current_norm = V4L2_STD_UNKNOWN; vdev->fops = &soc_camera_fops; vdev->ioctl_ops = &soc_camera_ioctl_ops; vdev->release = video_device_release; - vdev->tvnorms = V4L2_STD_UNKNOWN; vdev->ctrl_handler = &icd->ctrl_handler; vdev->lock = &ici->host_lock; |
