From 0737cbbd0b8957b816bf93819ff0441dbd67069b Mon Sep 17 00:00:00 2001 From: William Wu Date: Tue, 7 Apr 2020 10:45:12 +0800 Subject: [PATCH] Revert "usb: gadget: uvc: fix bFrameIndex of streaming interface descriptor" This reverts commit 154e7b74ec4db8bb2714938e332c79a05efdbda5. Change-Id: I5f9835e4bcd716ee2bc938937accebb3cdfc71fd Signed-off-by: William Wu --- drivers/usb/gadget/function/uvc_configfs.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c index 705840ac83d7..f1dcb2860a05 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -1840,7 +1840,6 @@ static int __uvcg_iter_strm_cls(struct uvcg_streaming_header *h, if (ret) return ret; } - j = 0; } return ret; @@ -1975,15 +1974,12 @@ static int __uvcg_fill_strm(void *priv1, void *priv2, void *priv3, int n, sizeof(*frm->dw_frame_interval); memcpy(*dest, frm->dw_frame_interval, sz); *dest += sz; - if (frm->fmt_type == UVCG_UNCOMPRESSED) { + if (frm->fmt_type == UVCG_UNCOMPRESSED) h->bLength = UVC_DT_FRAME_UNCOMPRESSED_SIZE( frm->frame.b_frame_interval_type); - frm->frame.b_frame_index = n + 1; - } else if (frm->fmt_type == UVCG_MJPEG) { + else if (frm->fmt_type == UVCG_MJPEG) h->bLength = UVC_DT_FRAME_MJPEG_SIZE( frm->frame.b_frame_interval_type); - frm->frame.b_frame_index = n + 1; - } } break; }