diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-13 11:10:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-13 11:10:24 -0500 |
commit | bd5f0ac930168899003952110c45d110958a5c55 (patch) | |
tree | 24be938817ec7ae68fb0f7f585c8af117a3160bb /drivers/media/video/bttvp.h | |
parent | 9b565eb794eec1ccd9edcc7263ebe5b3245a1e65 (diff) |
V4L/DVB (3354e): bttv semaphore to mutex conversion
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
build-tested.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bttvp.h')
-rw-r--r-- | drivers/media/video/bttvp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index dd00c20ab95e..9cb72f176f7d 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/videodev.h> | 35 | #include <linux/videodev.h> |
36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
37 | #include <linux/input.h> | 37 | #include <linux/input.h> |
38 | #include <linux/mutex.h> | ||
38 | #include <asm/scatterlist.h> | 39 | #include <asm/scatterlist.h> |
39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
40 | 41 | ||
@@ -309,9 +310,9 @@ struct bttv { | |||
309 | 310 | ||
310 | /* locking */ | 311 | /* locking */ |
311 | spinlock_t s_lock; | 312 | spinlock_t s_lock; |
312 | struct semaphore lock; | 313 | struct mutex lock; |
313 | int resources; | 314 | int resources; |
314 | struct semaphore reslock; | 315 | struct mutex reslock; |
315 | #ifdef VIDIOC_G_PRIORITY | 316 | #ifdef VIDIOC_G_PRIORITY |
316 | struct v4l2_prio_state prio; | 317 | struct v4l2_prio_state prio; |
317 | #endif | 318 | #endif |