summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-05 10:51:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-29 17:30:51 +0200
commit8c09a1267dfe3b4844a39a380a21dce08b5bbc39 (patch)
tree8a6e640f2ac3e80db2bb41fb6a78566d61de3f5c
parent85b866e4c4e63a1d7afb58f1e24273caad03d0b7 (diff)
downloadlinux-8c09a1267dfe3b4844a39a380a21dce08b5bbc39.tar.gz
linux-8c09a1267dfe3b4844a39a380a21dce08b5bbc39.tar.bz2
linux-8c09a1267dfe3b4844a39a380a21dce08b5bbc39.zip
Revert "usb: gadget: uvc: cleanup request when not in correct state"
commit dddc00f255415b826190cfbaa5d6dbc87cd9ded1 upstream. This reverts commit 52a39f2cf62bb5430ad1f54cd522dbfdab1d71ba. Based on review comments, it was applied too soon and needs more work. Reported-by: Laurent 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/function/uvc_video.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 95e3611811cd..be48d5ab17c7 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -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;