diff options
Diffstat (limited to 'drivers/usb/media/usbvideo.h')
-rw-r--r-- | drivers/usb/media/usbvideo.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/media/usbvideo.h b/drivers/usb/media/usbvideo.h index 6c390a1f981b..135433c2680a 100644 --- a/drivers/usb/media/usbvideo.h +++ b/drivers/usb/media/usbvideo.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/config.h> | 19 | #include <linux/config.h> |
20 | #include <linux/videodev.h> | 20 | #include <linux/videodev.h> |
21 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
22 | #include <linux/mutex.h> | ||
22 | 23 | ||
23 | /* Most helpful debugging aid */ | 24 | /* Most helpful debugging aid */ |
24 | #define assert(expr) ((void) ((expr) ? 0 : (err("assert failed at line %d",__LINE__)))) | 25 | #define assert(expr) ((void) ((expr) ? 0 : (err("assert failed at line %d",__LINE__)))) |
@@ -213,7 +214,7 @@ struct uvd { | |||
213 | unsigned long flags; /* FLAGS_USBVIDEO_xxx */ | 214 | unsigned long flags; /* FLAGS_USBVIDEO_xxx */ |
214 | unsigned long paletteBits; /* Which palettes we accept? */ | 215 | unsigned long paletteBits; /* Which palettes we accept? */ |
215 | unsigned short defaultPalette; /* What palette to use for read() */ | 216 | unsigned short defaultPalette; /* What palette to use for read() */ |
216 | struct semaphore lock; | 217 | struct mutex lock; |
217 | int user; /* user count for exclusive use */ | 218 | int user; /* user count for exclusive use */ |
218 | 219 | ||
219 | videosize_t videosize; /* Current setting */ | 220 | videosize_t videosize; /* Current setting */ |
@@ -272,7 +273,7 @@ struct usbvideo { | |||
272 | int num_cameras; /* As allocated */ | 273 | int num_cameras; /* As allocated */ |
273 | struct usb_driver usbdrv; /* Interface to the USB stack */ | 274 | struct usb_driver usbdrv; /* Interface to the USB stack */ |
274 | char drvName[80]; /* Driver name */ | 275 | char drvName[80]; /* Driver name */ |
275 | struct semaphore lock; /* Mutex protecting camera structures */ | 276 | struct mutex lock; /* Mutex protecting camera structures */ |
276 | struct usbvideo_cb cb; /* Table of callbacks (virtual methods) */ | 277 | struct usbvideo_cb cb; /* Table of callbacks (virtual methods) */ |
277 | struct video_device vdt; /* Video device template */ | 278 | struct video_device vdt; /* Video device template */ |
278 | struct uvd *cam; /* Array of camera structures */ | 279 | struct uvd *cam; /* Array of camera structures */ |