bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix uvc debug patch format

Browse Source
This commit is contained in:
Brad Stein 2026-01-23 16:39:48 -03:00
parent dc971175d9
commit fca161865b
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/kernel/uvc-debug.patch
View File

@ -1,5 +1,26 @@
--- a/drivers/usb/gadget/function/uvc_video.c --- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c
@@ -528,7 +528,20 @@
if (req_size > max_req_size) {
/* The prepared interval length and expected buffer size
* is not possible to stream with the currently configured
* isoc bandwidth. Fallback to the maximum.
*/
req_size = max_req_size;
}
video->req_size = req_size;
+
+ if (!req_size || !video->max_payload_size || !video->imagesize || !nreq) {
+ uvcg_info(&uvc->func,
+ "Video prep requests: imagesize=%u interval=%u interval_dur=%u nreq=%u header=%u req_size=%u max_req=%u max_payload=%u ep_maxpacket=%u maxburst=%u mult=%u bInterval=%u speed=%u\n",
+ video->imagesize, video->interval, interval_duration, nreq,
+ header_size, req_size, max_req_size,
+ video->max_payload_size, video->ep->maxpacket,
+ video->ep->maxburst, video->ep->mult,
+ video->ep->desc->bInterval, cdev->gadget->speed);
+ }
/* We need to compensate the amount of requests to be
@@ -763,17 +763,60 @@ @@ -763,17 +763,60 @@
{ {
int ret; int ret;
@ -12,7 +33,7 @@
+ if (!video->uvc || !video->uvc->func.config || + if (!video->uvc || !video->uvc->func.config ||
+ !video->uvc->func.config->cdev) { + !video->uvc->func.config->cdev) {
+ pr_err("uvcg_video_enable: missing uvc/func/config video=%p uvc=%p\n", + pr_err("uvcg_video_enable: missing uvc/func/config video=%p uvc=%p\n",
+ video, video->uvc); + video, video->uvc);
+ return -ENODEV; + return -ENODEV;
+ } + }
+ +
@ -60,25 +81,3 @@
/* /*
* Safe to access request related fields without req_lock because * Safe to access request related fields without req_lock because
* this is the only thread currently active, and no other * this is the only thread currently active, and no other
@@ -510,6 +532,19 @@
if (req_size > max_req_size) {
/* The prepared interval length and expected buffer size
* is not possible to stream with the currently configured
* isoc bandwidth. Fallback to the maximum.
*/
req_size = max_req_size;
}
video->req_size = req_size;
if (!req_size || !video->max_payload_size || !video->imagesize || !nreq) {
uvcg_info(&uvc->func,
"Video prep requests: imagesize=%u interval=%u interval_dur=%u nreq=%u header=%u req_size=%u max_req=%u max_payload=%u ep_maxpacket=%u maxburst=%u mult=%u bInterval=%u speed=%u\n",
video->imagesize, video->interval, interval_duration, nreq,
header_size, req_size, max_req_size,
video->max_payload_size, video->ep->maxpacket,
video->ep->maxburst, video->ep->mult,
video->ep->desc->bInterval, cdev->gadget->speed);
}
/* We need to compensate the amount of requests to be