summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 06:38:52 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 16:56:31 +0100
commit9d4d9c05c807ab8a49ac0024987b223bb32c022d (patch)
tree6f2401a04654a11e2190ce610eab664693784a66 /drivers/media/video/em28xx/em28xx.h
parent[PATCH] V4L: 919: improves the audio handling for nicam on cx88-audio (diff)
downloadlinux-9d4d9c05c807ab8a49ac0024987b223bb32c022d.tar.xz
linux-9d4d9c05c807ab8a49ac0024987b223bb32c022d.zip
[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.h4
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 @@
/* default alternate; 0 means choose the best */
#define EM28XX_PINOUT 0
-#define EM28XX_MAX_ALT 7
#define EM28XX_INTERLACED_DEFAULT 1
@@ -267,7 +266,8 @@ struct em28xx {
struct usb_device *udev; /* the usb device */
int alt; /* alternate */
int max_pkt_size; /* max packet size of isoc transaction */
- unsigned int alt_max_pkt_size[EM28XX_MAX_ALT + 1]; /* array of wMaxPacketSize */
+ int num_alt; /* Number of alternative settings */
+ unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */
char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
/* helper funcs that call usb_control_msg */