Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / uvc / uvcvideo.h

diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
old mode 100644 (file)
new mode 100755 (executable)
index 892e0e5..bab1fa6
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -401,8 +401,11 @@ struct uvc_video_queue {
        struct mutex mutex;     /* protects buffers and mainqueue */
        spinlock_t irqlock;     /* protects irqqueue */
 
+    wait_queue_head_t wait; /* wait if mainqueue is empty */
+
        struct list_head mainqueue;
        struct list_head irqqueue;
+    
 };
 
 struct uvc_video_chain {
@@ -459,6 +462,8 @@ struct uvc_streaming {
        unsigned int urb_size;
 
        __u8 last_fid;
+
+    struct tasklet_struct *tasklet[UVC_URBS];     /* ddl@rock-chips.com */
 };
 
 enum uvc_device_state {