shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "usb: gadget: uvc: fix bFrameIndex of streaming interface descriptor"

Browse Source 
This reverts commit 154e7b74ec.

Change-Id: I5f9835e4bcd716ee2bc938937accebb3cdfc71fd
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2020-04-07 10:45:12 +08:00
committed by Tao Huang
parent 90c3dec637
commit 0737cbbd0b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/function/uvc_configfs.c
View File

@@ -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;
}