projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.18
[openwrt/staging/stintel.git]
/
target
/
linux
/
ramips
/
patches-3.14
/
0057-uvc-add-iPassion-iP2970-support.patch
diff --git
a/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch
b/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch
index 89e46b904d965c445ea267bc2a0ce64fe39a447b..43b2b33b5f770b6797bc313467211c086b7d4847 100644
(file)
--- a/
target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch
+++ b/
target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch
@@
-11,11
+11,9
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/media/usb/uvc/uvcvideo.h | 3 +
4 files changed, 166 insertions(+)
drivers/media/usb/uvc/uvcvideo.h | 3 +
4 files changed, 166 insertions(+)
-diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
-index c3bb250..c6612d4 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2467,6 +2467,20 @@ static struct usb_device_id uvc_ids[] =
{
+@@ -2467,6 +2467,20 @@ static struct usb_device_id uvc_ids[] =
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_PROBE_MINMAX
| UVC_QUIRK_IGNORE_SELECTOR_UNIT },
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_PROBE_MINMAX
| UVC_QUIRK_IGNORE_SELECTOR_UNIT },
@@
-36,11
+34,9
@@
index c3bb250..c6612d4 100644
/* Generic USB Video Class */
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },
{}
/* Generic USB Video Class */
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },
{}
-diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
-index f552ab9..7132ad4 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
-@@ -139,6 +139,7 @@ static void uvc_status_complete(struct u
rb *urb)
+@@ -139,6 +139,7 @@ static void uvc_status_complete(struct u
switch (dev->status[0] & 0x0f) {
case UVC_STATUS_TYPE_CONTROL:
uvc_event_control(dev, dev->status, len);
switch (dev->status[0] & 0x0f) {
case UVC_STATUS_TYPE_CONTROL:
uvc_event_control(dev, dev->status, len);
@@
-48,7
+44,7
@@
index f552ab9..7132ad4 100644
break;
case UVC_STATUS_TYPE_STREAMING:
break;
case UVC_STATUS_TYPE_STREAMING:
-@@ -182,6 +183,7 @@ int uvc_status_init(struct uvc_device *d
ev)
+@@ -182,6 +183,7 @@ int uvc_status_init(struct uvc_device *d
}
pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
}
pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
@@
-56,8
+52,6
@@
index f552ab9..7132ad4 100644
/* For high-speed interrupt endpoints, the bInterval value is used as
* an exponent of two. Some developers forgot about it.
/* For high-speed interrupt endpoints, the bInterval value is used as
* an exponent of two. Some developers forgot about it.
-diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
-index 898c208..2e06163 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -21,6 +21,11 @@
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -21,6 +21,11 @@
@@
-72,7
+66,7
@@
index 898c208..2e06163 100644
#include <media/v4l2-common.h>
#include <media/v4l2-common.h>
-@@ -10
75,9 +1080,149 @@ static void uvc_video_decode_data(struct uvc_streaming *stream,
+@@ -10
80,9 +1085,149 @@ static void uvc_video_decode_data(struct
}
}
}
}
@@
-222,7
+216,7
@@
index 898c208..2e06163 100644
/* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
/* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
-@@ -14
78,6 +1623,8 @@ static int uvc_init_video_isoc(struct uvc_streaming *stream,
+@@ -14
83,6 +1628,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0)
return -ENOMEM;
if (npackets == 0)
return -ENOMEM;
@@
-231,8
+225,6
@@
index 898c208..2e06163 100644
size = npackets * psize;
for (i = 0; i < UVC_URBS; ++i) {
size = npackets * psize;
for (i = 0; i < UVC_URBS; ++i) {
-diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
-index 9e35982..3cacdfd 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -137,6 +137,8 @@
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -137,6 +137,8 @@
@@
-252,6
+244,3
@@
index 9e35982..3cacdfd 100644
};
enum uvc_handle_state {
};
enum uvc_handle_state {
---
-1.7.10.4
-