diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-12-24 07:31:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 22:36:23 -0500 |
commit | dd669e907cbe1cf33f9cbbff79af2b5c271cdd89 (patch) | |
tree | aeb887abff9f1641fc6bc4bc44a31196aafb793b /include/media/soc_camera.h | |
parent | 8a97d4c11756ab6bab8582126d0f1b5c00b067ad (diff) |
[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 { | |||
46 | int num_user_formats; | 46 | int num_user_formats; |
47 | enum v4l2_field field; /* Preserve field over close() */ | 47 | enum v4l2_field field; /* Preserve field over close() */ |
48 | void *host_priv; /* Per-device host private data */ | 48 | void *host_priv; /* Per-device host private data */ |
49 | /* soc_camera.c private count. Only accessed with .video_lock held */ | 49 | /* soc_camera.c private count. Only accessed with .host_lock held */ |
50 | int use_count; | 50 | int use_count; |
51 | struct mutex video_lock; /* Protects device data */ | ||
52 | struct file *streamer; /* stream owner */ | 51 | struct file *streamer; /* stream owner */ |
53 | union { | 52 | union { |
54 | struct videobuf_queue vb_vidq; | 53 | struct videobuf_queue vb_vidq; |