Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2766a7a9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5d408108

drivers/media/platform/soc_camera/soc_camera.c

+0 −3
Original line number Diff line number Diff line
@@ -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;