diff options
| author | Guennadi Liakhovetski | 2012-12-24 13:31:33 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-01-05 04:36:23 +0100 |
| commit | dd669e907cbe1cf33f9cbbff79af2b5c271cdd89 (patch) | |
| tree | aeb887abff9f1641fc6bc4bc44a31196aafb793b /include/media/soc_camera.h | |
| parent | [media] soc-camera: fix repeated regulator requesting (diff) | |
| download | kernel-qcow2-linux-dd669e907cbe1cf33f9cbbff79af2b5c271cdd89.tar.gz kernel-qcow2-linux-dd669e907cbe1cf33f9cbbff79af2b5c271cdd89.tar.xz kernel-qcow2-linux-dd669e907cbe1cf33f9cbbff79af2b5c271cdd89.zip | |
[media] soc-camera: remove struct soc_camera_device::video_lock
Currently soc-camera has a per-device node lock, used for video operations
and a per-host lock for code paths, modifying host's pipeline. Manipulating
the two locks increases complexity and doesn't bring any advantages. This
patch removes the per-device lock and uses the per-host lock for all
operations.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/soc_camera.h')
| -rw-r--r-- | include/media/soc_camera.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 0370a9517282..5a662c981484 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -46,9 +46,8 @@ struct soc_camera_device { int num_user_formats; enum v4l2_field field; /* Preserve field over close() */ void *host_priv; /* Per-device host private data */ - /* soc_camera.c private count. Only accessed with .video_lock held */ + /* soc_camera.c private count. Only accessed with .host_lock held */ int use_count; - struct mutex video_lock; /* Protects device data */ struct file *streamer; /* stream owner */ union { struct videobuf_queue vb_vidq; |