diff options
Diffstat (limited to 'drivers/media/video/w9968cf.h')
-rw-r--r-- | drivers/media/video/w9968cf.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h index a87be719a281..2836b45ec206 100644 --- a/drivers/media/video/w9968cf.h +++ b/drivers/media/video/w9968cf.h | |||
@@ -61,7 +61,7 @@ | |||
61 | 61 | ||
62 | /* Maximum data payload sizes in bytes for alternate settings */ | 62 | /* Maximum data payload sizes in bytes for alternate settings */ |
63 | static const u16 wMaxPacketSize[] = {1023, 959, 895, 831, 767, 703, 639, 575, | 63 | static const u16 wMaxPacketSize[] = {1023, 959, 895, 831, 767, 703, 639, 575, |
64 | 511, 447, 383, 319, 255, 191, 127, 63}; | 64 | 511, 447, 383, 319, 255, 191, 127, 63}; |
65 | #define W9968CF_PACKET_SIZE 1023 /* according to wMaxPacketSizes[] */ | 65 | #define W9968CF_PACKET_SIZE 1023 /* according to wMaxPacketSizes[] */ |
66 | #define W9968CF_MIN_PACKET_SIZE 63 /* minimum value */ | 66 | #define W9968CF_MIN_PACKET_SIZE 63 /* minimum value */ |
67 | #define W9968CF_ISO_PACKETS 5 /* n.of packets for isochronous transfers */ | 67 | #define W9968CF_ISO_PACKETS 5 /* n.of packets for isochronous transfers */ |
@@ -134,7 +134,7 @@ static const struct w9968cf_format w9968cf_formatlist[] = { | |||
134 | ****************************************************************************/ | 134 | ****************************************************************************/ |
135 | 135 | ||
136 | #define W9968CF_MODULE_NAME "V4L driver for W996[87]CF JPEG USB " \ | 136 | #define W9968CF_MODULE_NAME "V4L driver for W996[87]CF JPEG USB " \ |
137 | "Dual Mode Camera Chip" | 137 | "Dual Mode Camera Chip" |
138 | #define W9968CF_MODULE_VERSION "1:1.33-basic" | 138 | #define W9968CF_MODULE_VERSION "1:1.33-basic" |
139 | #define W9968CF_MODULE_AUTHOR "(C) 2002-2004 Luca Risolia" | 139 | #define W9968CF_MODULE_AUTHOR "(C) 2002-2004 Luca Risolia" |
140 | #define W9968CF_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>" | 140 | #define W9968CF_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>" |
@@ -270,9 +270,9 @@ struct w9968cf_device { | |||
270 | 270 | ||
271 | /* Locks */ | 271 | /* Locks */ |
272 | struct mutex dev_mutex, /* for probe, disconnect,open and close */ | 272 | struct mutex dev_mutex, /* for probe, disconnect,open and close */ |
273 | fileop_mutex; /* for read and ioctl */ | 273 | fileop_mutex; /* for read and ioctl */ |
274 | spinlock_t urb_lock, /* for submit_urb() and unlink_urb() */ | 274 | spinlock_t urb_lock, /* for submit_urb() and unlink_urb() */ |
275 | flist_lock; /* for requested frame list accesses */ | 275 | flist_lock; /* for requested frame list accesses */ |
276 | wait_queue_head_t open, wait_queue; | 276 | wait_queue_head_t open, wait_queue; |
277 | 277 | ||
278 | char command[16]; /* name of the program holding the device */ | 278 | char command[16]; /* name of the program holding the device */ |
@@ -299,7 +299,7 @@ struct w9968cf_device { | |||
299 | dev_warn(&cam->dev, fmt "\n", ## args); \ | 299 | dev_warn(&cam->dev, fmt "\n", ## args); \ |
300 | else if ((level) >= 5) \ | 300 | else if ((level) >= 5) \ |
301 | dev_info(&cam->dev, "[%s:%d] " fmt "\n", \ | 301 | dev_info(&cam->dev, "[%s:%d] " fmt "\n", \ |
302 | __FUNCTION__, __LINE__ , ## args); \ | 302 | __FUNCTION__, __LINE__ , ## args); \ |
303 | } \ | 303 | } \ |
304 | } | 304 | } |
305 | /* For generic kernel (not device specific) messages */ | 305 | /* For generic kernel (not device specific) messages */ |
@@ -311,7 +311,7 @@ struct w9968cf_device { | |||
311 | pr_info("w9968cf: " fmt "\n", ## args); \ | 311 | pr_info("w9968cf: " fmt "\n", ## args); \ |
312 | else if ((level) >= 5) \ | 312 | else if ((level) >= 5) \ |
313 | pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__, \ | 313 | pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__, \ |
314 | __LINE__ , ## args); \ | 314 | __LINE__ , ## args); \ |
315 | } \ | 315 | } \ |
316 | } | 316 | } |
317 | #else | 317 | #else |