github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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().

Change-Id: I4d7a70560961da90561a7999ac4e58a294c1a0cf
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 0e3e97526a)
This commit is contained in:
Felipe Balbi 2017-06-06 14:47:29 +03:00 committed by Tao Huang
parent 40a0fea3e4
commit d250b6bf0e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,6 +263,9 @@ void usb_remove_function(struct usb_configuration *c, struct usb_function *f)
list_del(&f->list);
if (f->unbind)
f->unbind(c, f);
if (f->bind_deactivated)
usb_function_activate(f);
}
EXPORT_SYMBOL_GPL(usb_remove_function);
@ -866,12 +869,8 @@ static void remove_config(struct usb_composite_dev *cdev,
f = list_first_entry(&config->functions,
struct usb_function, list);
list_del(&f->list);
if (f->unbind) {
DBG(cdev, "unbind function '%s'/%p\n", f->name, f);
f->unbind(config, f);
/* may free memory for "f" */
}
usb_remove_function(config, f);
}
list_del(&config->list);
if (config->unbind) {

3
drivers/usb/gadget/configfs.c
View File

@ -1255,6 +1255,9 @@ static void purge_configs_funcs(struct gadget_info *gi)
" '%s'/%p\n", f->name, f);
f->unbind(c, f);
}
if (f->bind_deactivated)
usb_function_activate(f);
}
c->next_interface_id = 0;
memset(c->interface, 0, sizeof(c->interface));