Commit 0e3e9752 authored by Felipe Balbi's avatar Felipe Balbi

usb: gadget: composite: make sure to reactivate function on unbind

If a function sets bind_deactivated flag, upon removal we will be left
with an unbalanced deactivation. Let's make sure that we conditionally
call usb_function_activate() from usb_remove_function() and make sure
usb_remove_function() is called from remove_config().
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent afbbc791
...@@ -315,6 +315,9 @@ void usb_remove_function(struct usb_configuration *c, struct usb_function *f) ...@@ -315,6 +315,9 @@ void usb_remove_function(struct usb_configuration *c, struct usb_function *f)
list_del(&f->list); list_del(&f->list);
if (f->unbind) if (f->unbind)
f->unbind(c, f); f->unbind(c, f);
if (f->bind_deactivated)
usb_function_activate(f);
} }
EXPORT_SYMBOL_GPL(usb_remove_function); EXPORT_SYMBOL_GPL(usb_remove_function);
...@@ -956,12 +959,8 @@ static void remove_config(struct usb_composite_dev *cdev, ...@@ -956,12 +959,8 @@ static void remove_config(struct usb_composite_dev *cdev,
f = list_first_entry(&config->functions, f = list_first_entry(&config->functions,
struct usb_function, list); struct usb_function, list);
list_del(&f->list);
if (f->unbind) { usb_remove_function(config, f);
DBG(cdev, "unbind function '%s'/%p\n", f->name, f);
f->unbind(config, f);
/* may free memory for "f" */
}
} }
list_del(&config->list); list_del(&config->list);
if (config->unbind) { if (config->unbind) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment