Commit b7a5aed1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Wen Zhiwei
Browse files

Revert "usb: gadget: uvc: cleanup request when not in correct state" 

stable inclusion
from stable-v6.6.48
commit 8e1f64d44664e90bded7d4fd7097e4d8c67f2074
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWEBV

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8e1f64d44664e90bded7d4fd7097e4d8c67f2074



--------------------------------

commit dddc00f255415b826190cfbaa5d6dbc87cd9ded1 upstream.

This reverts commit 52a39f2cf62bb5430ad1f54cd522dbfdab1d71ba.

Based on review comments, it was applied too soon and needs more work.

Reported-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20231005081716.GA13853@pendragon.ideasonboard.com


Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent a30a8e62

drivers/usb/gadget/function/uvc_video.c

+0 −6
Original line number Diff line number Diff line
@@ -259,12 +259,6 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req) 
	struct uvc_device *uvc = video->uvc;

	unsigned long flags;



	if (uvc->state == UVC_STATE_CONNECTED) {

		usb_ep_free_request(video->ep, ureq->req);

		ureq->req = NULL;

		return;

	}



	switch (req->status) {

	case 0:

		break;