OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 11... Line 11...
11 drivers/media/usb/uvc/uvcvideo.h | 5 +- 11 drivers/media/usb/uvc/uvcvideo.h | 5 +-
12 4 files changed, 165 insertions(+), 1 deletion(-) 12 4 files changed, 165 insertions(+), 1 deletion(-)
Line 13... Line 13...
13   13  
14 --- a/drivers/media/usb/uvc/uvc_driver.c 14 --- a/drivers/media/usb/uvc/uvc_driver.c
15 +++ b/drivers/media/usb/uvc/uvc_driver.c 15 +++ b/drivers/media/usb/uvc/uvc_driver.c
16 @@ -2727,6 +2727,18 @@ static const struct usb_device_id uvc_id 16 @@ -2734,6 +2734,18 @@ static const struct usb_device_id uvc_id
17 .bInterfaceSubClass = 1, 17 .bInterfaceSubClass = 1,
18 .bInterfaceProtocol = 0, 18 .bInterfaceProtocol = 0,
19 .driver_info = UVC_QUIRK_FORCE_Y8 }, 19 .driver_info = UVC_QUIRK_FORCE_Y8 },
20 + /* iPassion iP2970 */ 20 + /* iPassion iP2970 */
Line 62... Line 62...
62 +#include <linux/kobject.h> 62 +#include <linux/kobject.h>
63 +#include <linux/workqueue.h> 63 +#include <linux/workqueue.h>
Line 64... Line 64...
64 64
Line 65... Line 65...
65 #include <media/v4l2-common.h> 65 #include <media/v4l2-common.h>
66 66
67 @@ -1093,9 +1098,149 @@ static void uvc_video_decode_data(struct 67 @@ -1081,9 +1086,149 @@ static void uvc_video_decode_data(struct
Line 68... Line 68...
68 } 68 }
69 } 69 }
Line 212... Line 212...
212 + } 212 + }
213 + 213 +
214 /* Mark the buffer as done if the EOF marker is set. */ 214 /* Mark the buffer as done if the EOF marker is set. */
215 if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { 215 if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
216 uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); 216 uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
217 @@ -1510,6 +1655,8 @@ static int uvc_init_video_isoc(struct uv 217 @@ -1498,6 +1643,8 @@ static int uvc_init_video_isoc(struct uv
218 if (npackets == 0) 218 if (npackets == 0)
219 return -ENOMEM; 219 return -ENOMEM;
Line 220... Line 220...
220 220
221 + if (stream->dev->quirks & UVC_QUIRK_SINGLE_ISO) 221 + if (stream->dev->quirks & UVC_QUIRK_SINGLE_ISO)