diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-06-29 12:46:40 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 22:56:08 +0200 |
| commit | 7a05dfeddee9ffc2405230759ef32ecb603e3f48 (patch) | |
| tree | f23960145913e8a058572018b750ac1933149a82 /drivers/media | |
| parent | [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks (diff) | |
| download | linux-7a05dfeddee9ffc2405230759ef32ecb603e3f48.tar.xz linux-7a05dfeddee9ffc2405230759ef32ecb603e3f48.zip | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 3 |
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) icd->field = V4L2_FIELD_ANY; - icd->vdev->lock = &icd->video_lock; - /* * ..._video_start() will create a device node, video_register_device() * 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) vdev->ioctl_ops = &soc_camera_ioctl_ops; vdev->release = video_device_release; vdev->tvnorms = V4L2_STD_UNKNOWN; + vdev->lock = &icd->video_lock; icd->vdev = vdev; |