Commit 88c8e05e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: gadget: uvc: limit isoc_sg to super speed gadgets" 



This reverts commit 19905240.

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: 19905240 ("usb: gadget: uvc: limit isoc_sg to super speed gadgets")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5aed5b7c

drivers/usb/gadget/function/uvc_queue.c

+6 −3
Original line number Diff line number Diff line
@@ -84,9 +84,12 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb) 
		return -ENODEV;



	buf->state = UVC_BUF_STATE_QUEUED;

	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;

drivers/usb/gadget/function/uvc_video.c

+2 −7
Original line number Diff line number Diff line
@@ -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;
@@ -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;