aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-06-29 06:46:40 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:56:08 -0400
commit7a05dfeddee9ffc2405230759ef32ecb603e3f48 (patch)
treef23960145913e8a058572018b750ac1933149a82
parent033d7463f816315308ffec6f69576d820bfbab0c (diff)
[media] V4L: soc-camera: group struct field initialisations together
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/soc_camera.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 5084e72d4965..96bed292c548 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -1118,8 +1118,6 @@ static int soc_camera_probe(struct device *dev)
1118 1118
1119 icd->field = V4L2_FIELD_ANY; 1119 icd->field = V4L2_FIELD_ANY;
1120 1120
1121 icd->vdev->lock = &icd->video_lock;
1122
1123 /* 1121 /*
1124 * ..._video_start() will create a device node, video_register_device() 1122 * ..._video_start() will create a device node, video_register_device()
1125 * itself is protected against concurrent open() calls, but we also have 1123 * itself is protected against concurrent open() calls, but we also have
@@ -1468,6 +1466,7 @@ static int video_dev_create(struct soc_camera_device *icd)
1468 vdev->ioctl_ops = &soc_camera_ioctl_ops; 1466 vdev->ioctl_ops = &soc_camera_ioctl_ops;
1469 vdev->release = video_device_release; 1467 vdev->release = video_device_release;
1470 vdev->tvnorms = V4L2_STD_UNKNOWN; 1468 vdev->tvnorms = V4L2_STD_UNKNOWN;
1469 vdev->lock = &icd->video_lock;
1471 1470
1472 icd->vdev = vdev; 1471 icd->vdev = vdev;
1473 1472