diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
commit | 2bf2154c6bb5599e3ec3f73c34861a0b12aa839e (patch) | |
tree | 62691bd915e2e3c2e6648306d3fb893f7a1dc57e /drivers/usb/media/ov511.h | |
parent | 08a4ecee986dd98e86090ff5faac4782b6765aed (diff) | |
parent | 71a8924bee63d891f6256d560e32416a458440b3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (81 commits)
[PATCH] USB: omninet: fix up debugging comments
[PATCH] USB serial: add navman driver
[PATCH] USB: Fix irda-usb use after use
[PATCH] USB: rtl8150 small fix
[PATCH] USB: ftdi_sio: add Icom ID1 USB product and vendor ids
[PATCH] USB: cp2101: add new device IDs
[PATCH] USB: fix check_ctrlrecip to allow control transfers in state ADDRESS
[PATCH] USB: vicam.c: fix a NULL pointer dereference
[PATCH] USB: ZC0301 driver bugfix
[PATCH] USB: add support for Creativelabs Silvercrest USB keyboard
[PATCH] USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
[PATCH] USB: storage: unusual_devs.h entry 0420:0001
[PATCH] USB: storage: another unusual_devs.h entry
[PATCH] USB: storage: sandisk unusual_devices entry
[PATCH] USB: fix initdata issue in isp116x-hcd
[PATCH] USB: usbcore: usb_set_configuration oops (NULL ptr dereference)
[PATCH] USB: usbcore: Don't assume a USB configuration includes any interfaces
[PATCH] USB: ub 03 drop stall clearing
[PATCH] USB: ub 02 remove diag
[PATCH] USB: ub 01 remove first_open
...
Diffstat (limited to 'drivers/usb/media/ov511.h')
-rw-r--r-- | drivers/usb/media/ov511.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/media/ov511.h b/drivers/usb/media/ov511.h index 086509a137c6..bce9b3633889 100644 --- a/drivers/usb/media/ov511.h +++ b/drivers/usb/media/ov511.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/videodev.h> | 5 | #include <linux/videodev.h> |
6 | #include <linux/smp_lock.h> | 6 | #include <linux/smp_lock.h> |
7 | #include <linux/usb.h> | 7 | #include <linux/usb.h> |
8 | #include <linux/mutex.h> | ||
8 | 9 | ||
9 | #define OV511_DEBUG /* Turn on debug messages */ | 10 | #define OV511_DEBUG /* Turn on debug messages */ |
10 | 11 | ||
@@ -435,7 +436,7 @@ struct usb_ov511 { | |||
435 | 436 | ||
436 | int led_policy; /* LED: off|on|auto; OV511+ only */ | 437 | int led_policy; /* LED: off|on|auto; OV511+ only */ |
437 | 438 | ||
438 | struct semaphore lock; /* Serializes user-accessible operations */ | 439 | struct mutex lock; /* Serializes user-accessible operations */ |
439 | int user; /* user count for exclusive use */ | 440 | int user; /* user count for exclusive use */ |
440 | 441 | ||
441 | int streaming; /* Are we streaming Isochronous? */ | 442 | int streaming; /* Are we streaming Isochronous? */ |
@@ -473,11 +474,9 @@ struct usb_ov511 { | |||
473 | int packet_size; /* Frame size per isoc desc */ | 474 | int packet_size; /* Frame size per isoc desc */ |
474 | int packet_numbering; /* Is ISO frame numbering enabled? */ | 475 | int packet_numbering; /* Is ISO frame numbering enabled? */ |
475 | 476 | ||
476 | struct semaphore param_lock; /* params lock for this camera */ | ||
477 | |||
478 | /* Framebuffer/sbuf management */ | 477 | /* Framebuffer/sbuf management */ |
479 | int buf_state; | 478 | int buf_state; |
480 | struct semaphore buf_lock; | 479 | struct mutex buf_lock; |
481 | 480 | ||
482 | struct ov51x_decomp_ops *decomp_ops; | 481 | struct ov51x_decomp_ops *decomp_ops; |
483 | 482 | ||
@@ -494,12 +493,12 @@ struct usb_ov511 { | |||
494 | int pal; /* Device is designed for PAL resolution */ | 493 | int pal; /* Device is designed for PAL resolution */ |
495 | 494 | ||
496 | /* I2C interface */ | 495 | /* I2C interface */ |
497 | struct semaphore i2c_lock; /* Protect I2C controller regs */ | 496 | struct mutex i2c_lock; /* Protect I2C controller regs */ |
498 | unsigned char primary_i2c_slave; /* I2C write id of sensor */ | 497 | unsigned char primary_i2c_slave; /* I2C write id of sensor */ |
499 | 498 | ||
500 | /* Control transaction stuff */ | 499 | /* Control transaction stuff */ |
501 | unsigned char *cbuf; /* Buffer for payload */ | 500 | unsigned char *cbuf; /* Buffer for payload */ |
502 | struct semaphore cbuf_lock; | 501 | struct mutex cbuf_lock; |
503 | }; | 502 | }; |
504 | 503 | ||
505 | /* Used to represent a list of values and their respective symbolic names */ | 504 | /* Used to represent a list of values and their respective symbolic names */ |