diff options
author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-07-02 09:04:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:28 -0400 |
commit | b9378fdbc334d1575b492108eac822a78c0c46d9 (patch) | |
tree | 9a78a121b72309a4471dee193ceefc5cb17ce520 /drivers/media/video/pwc/pwc.h | |
parent | 55c0d1005a0e5f590f71f918e49bdc81362f93a6 (diff) |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index acbb9312960a..910a04f53920 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
32 | #include <linux/smp_lock.h> | 32 | #include <linux/smp_lock.h> |
33 | #include <linux/version.h> | 33 | #include <linux/version.h> |
34 | #include <asm/semaphore.h> | 34 | #include <linux/mutex.h> |
35 | #include <asm/errno.h> | 35 | #include <asm/errno.h> |
36 | #include <linux/videodev.h> | 36 | #include <linux/videodev.h> |
37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
@@ -244,7 +244,7 @@ struct pwc_device | |||
244 | int image_read_pos; /* In case we read data in pieces, keep track of were we are in the imagebuffer */ | 244 | int image_read_pos; /* In case we read data in pieces, keep track of were we are in the imagebuffer */ |
245 | int image_used[MAX_IMAGES]; /* For MCAPTURE and SYNC */ | 245 | int image_used[MAX_IMAGES]; /* For MCAPTURE and SYNC */ |
246 | 246 | ||
247 | struct semaphore modlock; /* to prevent races in video_open(), etc */ | 247 | struct mutex modlock; /* to prevent races in video_open(), etc */ |
248 | spinlock_t ptrlock; /* for manipulating the buffer pointers */ | 248 | spinlock_t ptrlock; /* for manipulating the buffer pointers */ |
249 | 249 | ||
250 | /*** motorized pan/tilt feature */ | 250 | /*** motorized pan/tilt feature */ |