diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-29 14:43:20 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-10-20 16:58:48 -0400 |
| commit | e3122f5fedb6d88a043b60822f601f7ab517a465 (patch) | |
| tree | b67d18119cf553f96ec5b3f01b9aeead2bee3d25 | |
| parent | 62e370785cb337981999ac7ec364e22ffb6c2cd3 (diff) | |
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) | |||
| 390 | v4l2_event_queue(uvc->vdev, &v4l2_event); | 390 | v4l2_event_queue(uvc->vdev, &v4l2_event); |
| 391 | 391 | ||
| 392 | uvc->state = UVC_STATE_DISCONNECTED; | 392 | uvc->state = UVC_STATE_DISCONNECTED; |
| 393 | |||
| 394 | if (uvc->video.ep->driver_data) { | ||
| 395 | usb_ep_disable(uvc->video.ep); | ||
| 396 | uvc->video.ep->driver_data = NULL; | ||
| 397 | } | ||
| 398 | |||
| 399 | if (uvc->control_ep->driver_data) { | ||
| 400 | usb_ep_disable(uvc->control_ep); | ||
| 401 | uvc->control_ep->driver_data = NULL; | ||
| 402 | } | ||
| 393 | } | 403 | } |
| 394 | 404 | ||
| 395 | /* -------------------------------------------------------------------------- | 405 | /* -------------------------------------------------------------------------- |
