diff options
| author | Robert Baldyga <r.baldyga@samsung.com> | 2015-05-04 14:55:14 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-07-29 09:59:20 -0500 |
| commit | f277bf27cf5cd56bcd1c4b95ae140f61680a6e83 (patch) | |
| tree | deb63b95b651052b96535de242f32585200648f1 /drivers/usb/gadget/function/f_uvc.c | |
| parent | d5bb9b81dbfa35d117ecb58022ee6e7e41e4772d (diff) | |
usb: gadget: f_uvc: use bind_deactivated flag
Use bind_deactivated flag instead of calling usb_function_deactivate()
in function bind().
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_uvc.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_uvc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index cf0df8fbba89..743be34605dc 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -733,12 +733,6 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) uvc->control_req->complete = uvc_function_ep0_complete; uvc->control_req->context = uvc; - /* Avoid letting this gadget enumerate until the userspace server is - * active. - */ - if ((ret = usb_function_deactivate(f)) < 0) - goto error; - if (v4l2_device_register(&cdev->gadget->dev, &uvc->v4l2_dev)) { printk(KERN_INFO "v4l2_device_register failed\n"); goto error; @@ -949,6 +943,7 @@ static struct usb_function *uvc_alloc(struct usb_function_instance *fi) uvc->func.disable = uvc_function_disable; uvc->func.setup = uvc_function_setup; uvc->func.free_func = uvc_free; + uvc->func.bind_deactivated = true; return &uvc->func; } |