summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttvp.h
diff options
context:
space:
mode:
authorIngo Molnar2006-01-13 17:10:24 +0100
committerMauro Carvalho Chehab2006-01-13 17:10:24 +0100
commitbd5f0ac930168899003952110c45d110958a5c55 (patch)
tree24be938817ec7ae68fb0f7f585c8af117a3160bb /drivers/media/video/bttvp.h
parentV4L/DVB (3354a): Remove old MODULE_PARM in media/video/ (diff)
downloadkernel-qcow2-linux-bd5f0ac930168899003952110c45d110958a5c55.tar.gz
kernel-qcow2-linux-bd5f0ac930168899003952110c45d110958a5c55.tar.xz
kernel-qcow2-linux-bd5f0ac930168899003952110c45d110958a5c55.zip
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.h5
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 @@
#include <linux/videodev.h>
#include <linux/pci.h>
#include <linux/input.h>
+#include <linux/mutex.h>
#include <asm/scatterlist.h>
#include <asm/io.h>
@@ -309,9 +310,9 @@ struct bttv {
/* locking */
spinlock_t s_lock;
- struct semaphore lock;
+ struct mutex lock;
int resources;
- struct semaphore reslock;
+ struct mutex reslock;
#ifdef VIDIOC_G_PRIORITY
struct v4l2_prio_state prio;
#endif