2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Laurent Pinchart <[email protected]>

commit 4093a5c4a3f59cba1a085bbf87b6ffdddc5a443d upstream.

Commit 4057ac6ca9a77c4275b34b5925ab5c99557913b1

    V4L/DVB (13505): uvcvideo: Refactor chain scan

broke output terminals parsing. Fix it.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>

---
 drivers/media/video/uvc/uvc_driver.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: linux-2.6.35.y/drivers/media/video/uvc/uvc_driver.c
===================================================================
--- linux-2.6.35.y.orig/drivers/media/video/uvc/uvc_driver.c
+++ linux-2.6.35.y/drivers/media/video/uvc/uvc_driver.c
@@ -1261,6 +1261,14 @@ static int uvc_scan_chain_entity(struct 
 
                break;
 
+       case UVC_OTT_VENDOR_SPECIFIC:
+       case UVC_OTT_DISPLAY:
+       case UVC_OTT_MEDIA_TRANSPORT_OUTPUT:
+               if (uvc_trace_param & UVC_TRACE_PROBE)
+                       printk(" OT %d", entity->id);
+
+               break;
+
        case UVC_TT_STREAMING:
                if (UVC_ENTITY_IS_ITERM(entity)) {
                        if (uvc_trace_param & UVC_TRACE_PROBE)

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to