leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: composite: add bind_deactivated flag to usb_function

Browse Source 
This patch introduces 'bind_deactivated' flag in struct usb_function.
Functions which don't want to be activated automatically after bind should
set this flag, and when they start to be ready to work they should call
usb_function_activate().

When USB function sets 'bind_deactivated' flag, initial deactivation
counter is incremented automatically, so there is no need to call
usb_function_deactivate() in function bind.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Robert Baldyga 2015-05-04 14:55:13 +02:00 committed by Felipe Balbi
parent 5601250bb1
commit d5bb9b81db
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/composite.c
View File

@ -209,6 +209,12 @@ int usb_add_function(struct usb_configuration *config,
function->config = config; function->config = config;
list_add_tail(&function->list, &config->functions); list_add_tail(&function->list, &config->functions);
if (function->bind_deactivated) {
value = usb_function_deactivate(function);
if (value)
goto done;
}
/* REVISIT *require* function->bind? */ /* REVISIT *require* function->bind? */
if (function->bind) { if (function->bind) {
value = function->bind(config, function); value = function->bind(config, function);

2
include/linux/usb/composite.h
View File

@ -228,6 +228,8 @@ struct usb_function {
struct list_head list; struct list_head list;
DECLARE_BITMAP(endpoints, 32); DECLARE_BITMAP(endpoints, 32);
const struct usb_function_instance *fi; const struct usb_function_instance *fi;
unsigned int bind_deactivated:1;
}; };
int usb_add_function(struct usb_configuration *, struct usb_function *); int usb_add_function(struct usb_configuration *, struct usb_function *);