From: Manish Narani <manish.narani@xilinx.com>
To: <git-dev@xilinx.com>
Cc: <anirudh@xilinx.com>, Roger Quadros <rogerq@ti.com>,
<stable@vger.kernel.org>,
Felipe Balbi <felipe.balbi@linux.intel.com>
Subject: [PATCH] Revert "usb: gadget: uvc: Add missing call for additional setup data"
Date: Tue, 11 Apr 2017 11:42:05 +0530 [thread overview]
Message-ID: <1491891125-25721-1-git-send-email-mnarani@xilinx.com> (raw)
From: Roger Quadros <rogerq@ti.com>
This reverts commit 4fbac5206afd01b717d4bdc58793d471f3391b4b.
This commit breaks g_webcam when used with uvc-gadget [1].
The user space application (e.g. uvc-gadget) is responsible for
sending response to UVC class specific requests on control endpoint
in uvc_send_response() in uvc_v4l2.c.
The bad commit was causing a duplicate response to be sent with
incorrect response data thus causing UVC probe to fail at the host
and broken control transfer endpoint at the gadget.
[1] - git://git.ideasonboard.org/uvc-gadget.git
Cc: <stable@vger.kernel.org> # v4.9+
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
---
drivers/usb/gadget/function/f_uvc.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 27ed51b..29b41b5 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -258,13 +258,6 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
memcpy(&uvc_event->req, ctrl, sizeof(uvc_event->req));
v4l2_event_queue(&uvc->vdev, &v4l2_event);
- /* Pass additional setup data to userspace */
- if (uvc->event_setup_out && uvc->event_length) {
- uvc->control_req->length = uvc->event_length;
- return usb_ep_queue(uvc->func.config->cdev->gadget->ep0,
- uvc->control_req, GFP_ATOMIC);
- }
-
return 0;
}
--
2.7.4
next reply other threads:[~2017-04-11 6:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 6:12 Manish Narani [this message]
2017-04-11 6:59 ` [PATCH] Revert "usb: gadget: uvc: Add missing call for additional setup data" Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2017-03-02 8:44 Roger Quadros
2017-03-02 10:49 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491891125-25721-1-git-send-email-mnarani@xilinx.com \
--to=manish.narani@xilinx.com \
--cc=anirudh@xilinx.com \
--cc=felipe.balbi@linux.intel.com \
--cc=git-dev@xilinx.com \
--cc=rogerq@ti.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.