diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-29 20:43:20 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-10-20 22:58:48 +0200 |
| commit | e3122f5fedb6d88a043b60822f601f7ab517a465 (patch) | |
| tree | b67d18119cf553f96ec5b3f01b9aeead2bee3d25 | |
| parent | usb: gadget: function: uvc: manage our video control endpoint (diff) | |
| download | linux-e3122f5fedb6d88a043b60822f601f7ab517a465.tar.xz linux-e3122f5fedb6d88a043b60822f601f7ab517a465.zip | |
usb: gadget: function: uvc: disable endpoints on ->disable()
when our ->disable() method is called, we must
make sure to teardown all our resources, including
endpoints.
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/function/f_uvc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 413a09f366c4..945b3bd2ca98 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -390,6 +390,16 @@ uvc_function_disable(struct usb_function *f) v4l2_event_queue(uvc->vdev, &v4l2_event); uvc->state = UVC_STATE_DISCONNECTED; + + if (uvc->video.ep->driver_data) { + usb_ep_disable(uvc->video.ep); + uvc->video.ep->driver_data = NULL; + } + + if (uvc->control_ep->driver_data) { + usb_ep_disable(uvc->control_ep); + uvc->control_ep->driver_data = NULL; + } } /* -------------------------------------------------------------------------- |