aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc.h
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias.kaehlcke@gmail.com>2007-07-02 10:04:52 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 14:24:28 -0300
commitb9378fdbc334d1575b492108eac822a78c0c46d9 (patch)
tree9a78a121b72309a4471dee193ceefc5cb17ce520 /drivers/media/video/pwc/pwc.h
parent55c0d1005a0e5f590f71f918e49bdc81362f93a6 (diff)
downloadkernel_samsung_smdk4412-b9378fdbc334d1575b492108eac822a78c0c46d9.zip
kernel_samsung_smdk4412-b9378fdbc334d1575b492108eac822a78c0c46d9.tar.gz
kernel_samsung_smdk4412-b9378fdbc334d1575b492108eac822a78c0c46d9.tar.bz2
V4L/DVB (5809): Use mutex instead of semaphore in Philips webcam driver
The Philips webcam driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. -- Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
-rw-r--r--drivers/media/video/pwc/pwc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index acbb931..910a04f 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -31,7 +31,7 @@
#include <linux/wait.h>
#include <linux/smp_lock.h>
#include <linux/version.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
#include <asm/errno.h>
#include <linux/videodev.h>
#include <media/v4l2-common.h>
@@ -244,7 +244,7 @@ struct pwc_device
int image_read_pos; /* In case we read data in pieces, keep track of were we are in the imagebuffer */
int image_used[MAX_IMAGES]; /* For MCAPTURE and SYNC */
- struct semaphore modlock; /* to prevent races in video_open(), etc */
+ struct mutex modlock; /* to prevent races in video_open(), etc */
spinlock_t ptrlock; /* for manipulating the buffer pointers */
/*** motorized pan/tilt feature */