diff options
author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-10-24 16:31:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:00:55 -0500 |
commit | 289d4d2f0746715ada41e0945116eb3d62d5f35c (patch) | |
tree | dfb7dc29cd73101db3c3dc83a6835a1b2748955c /drivers/media/video/usbvision/usbvision.h | |
parent | b02044d81fc028d4fef1c65f9b179a0aec091f0b (diff) |
V4L/DVB (6400): usbvision: Convert the usbvision->lock semaphore to the mutex API
Convert the usbvision->lock semaphore to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Reviewed-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision.h')
-rw-r--r-- | drivers/media/video/usbvision/usbvision.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h index c5b6c501c869..c32f68566bf9 100644 --- a/drivers/media/video/usbvision/usbvision.h +++ b/drivers/media/video/usbvision/usbvision.h | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/list.h> | 34 | #include <linux/list.h> |
35 | #include <linux/usb.h> | 35 | #include <linux/usb.h> |
36 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
37 | #include <linux/mutex.h> | ||
37 | #include <media/v4l2-common.h> | 38 | #include <media/v4l2-common.h> |
38 | #include <media/tuner.h> | 39 | #include <media/tuner.h> |
39 | #include <linux/videodev2.h> | 40 | #include <linux/videodev2.h> |
@@ -396,7 +397,7 @@ struct usb_usbvision { | |||
396 | unsigned char iface; /* Video interface number */ | 397 | unsigned char iface; /* Video interface number */ |
397 | unsigned char ifaceAlt; /* Alt settings */ | 398 | unsigned char ifaceAlt; /* Alt settings */ |
398 | unsigned char Vin_Reg2_Preset; | 399 | unsigned char Vin_Reg2_Preset; |
399 | struct semaphore lock; | 400 | struct mutex lock; |
400 | struct timer_list powerOffTimer; | 401 | struct timer_list powerOffTimer; |
401 | struct work_struct powerOffWork; | 402 | struct work_struct powerOffWork; |
402 | int power; /* is the device powered on? */ | 403 | int power; /* is the device powered on? */ |