Skip to content

Commit

Permalink
Revert "usb: gadget: uvc: limit isoc_sg to super speed gadgets"
Browse files Browse the repository at this point in the history
This reverts commit 1990524.

It was a new feature, and it doesn't even work properly yet, so revert
it from this branch as it is not needed for 6.1-final.

Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: stable <stable@kernel.org>
Fixes: 1990524 ("usb: gadget: uvc: limit isoc_sg to super speed gadgets")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Oct 26, 2022
1 parent 5aed5b7 commit 88c8e05
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
9 changes: 6 additions & 3 deletions drivers/usb/gadget/function/uvc_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,12 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
return -ENODEV;

buf->state = UVC_BUF_STATE_QUEUED;
buf->sgt = vb2_dma_sg_plane_desc(vb, 0);
buf->sg = buf->sgt->sgl;
buf->mem = vb2_plane_vaddr(vb, 0);
if (queue->use_sg) {
buf->sgt = vb2_dma_sg_plane_desc(vb, 0);
buf->sg = buf->sgt->sgl;
} else {
buf->mem = vb2_plane_vaddr(vb, 0);
}
buf->length = vb2_plane_size(vb, 0);
if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
buf->bytesused = 0;
Expand Down
9 changes: 2 additions & 7 deletions drivers/usb/gadget/function/uvc_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,6 @@ static void uvcg_video_pump(struct work_struct *work)
*/
int uvcg_video_enable(struct uvc_video *video, int enable)
{
struct uvc_device *uvc = video->uvc;
struct usb_composite_dev *cdev = uvc->func.config->cdev;
struct usb_gadget *gadget = cdev->gadget;
unsigned int i;
int ret;

Expand Down Expand Up @@ -493,11 +490,9 @@ int uvcg_video_enable(struct uvc_video *video, int enable)
if (video->max_payload_size) {
video->encode = uvc_video_encode_bulk;
video->payload_size = 0;
} else {
video->encode = (video->queue.use_sg &&
!(gadget->speed <= USB_SPEED_HIGH)) ?
} else
video->encode = video->queue.use_sg ?
uvc_video_encode_isoc_sg : uvc_video_encode_isoc;
}

video->req_int_count = 0;

Expand Down

0 comments on commit 88c8e05

Please sign in to comment.