Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / au0828 / au0828.h

diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 9905bc4f5f59fa780c5b54debf6842ee7a9c42a0..9cde3532182414dc1a72ec265714015453c29fbb 100644 (file)
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -53,7 +53,7 @@
 
 /* Defination for AU0828 USB transfer */
 #define AU0828_MAX_ISO_BUFS    12  /* maybe resize this value in the future */
-#define AU0828_ISO_PACKETS_PER_URB      10
+#define AU0828_ISO_PACKETS_PER_URB      128
 
 #define AU0828_MIN_BUF 4
 #define AU0828_DEF_BUF 8
@@ -204,6 +204,10 @@ struct au0828_dev {
        unsigned int resources; /* resources in use */
        struct video_device *vdev;
        struct video_device *vbi_dev;
+       struct timer_list vid_timeout;
+       int vid_timeout_running;
+       struct timer_list vbi_timeout;
+       int vbi_timeout_running;
        int width;
        int height;
        int vbi_width;