diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-09 00:38:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:31 -0500 |
commit | 9d4d9c05c807ab8a49ac0024987b223bb32c022d (patch) | |
tree | 6f2401a04654a11e2190ce610eab664693784a66 /drivers/media/video/em28xx/em28xx.h | |
parent | 7f7e846ca552c4cf2e04b4666cea18dc26b36b59 (diff) |
[PATCH] V4L: 920: fixed autodetection of max size by if alternate setting
- Fixed autodetection of max size by if alternate setting
- Fixed some debug messages
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index d51f8c63bcf9..5c7a41ce69f3 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -63,7 +63,6 @@ | |||
63 | 63 | ||
64 | /* default alternate; 0 means choose the best */ | 64 | /* default alternate; 0 means choose the best */ |
65 | #define EM28XX_PINOUT 0 | 65 | #define EM28XX_PINOUT 0 |
66 | #define EM28XX_MAX_ALT 7 | ||
67 | 66 | ||
68 | #define EM28XX_INTERLACED_DEFAULT 1 | 67 | #define EM28XX_INTERLACED_DEFAULT 1 |
69 | 68 | ||
@@ -267,7 +266,8 @@ struct em28xx { | |||
267 | struct usb_device *udev; /* the usb device */ | 266 | struct usb_device *udev; /* the usb device */ |
268 | int alt; /* alternate */ | 267 | int alt; /* alternate */ |
269 | int max_pkt_size; /* max packet size of isoc transaction */ | 268 | int max_pkt_size; /* max packet size of isoc transaction */ |
270 | unsigned int alt_max_pkt_size[EM28XX_MAX_ALT + 1]; /* array of wMaxPacketSize */ | 269 | int num_alt; /* Number of alternative settings */ |
270 | unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ | ||
271 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ | 271 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ |
272 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ | 272 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ |
273 | /* helper funcs that call usb_control_msg */ | 273 | /* helper funcs that call usb_control_msg */ |