From c257b5bb9669f93f0fe439108e24cfb1bc235915 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sun, 23 Dec 2012 21:10:05 +0100 Subject: [PATCH] --- yaml --- r: 354645 b: refs/heads/master c: b473577854fea63055ff9ab84f0f52a3e8aed15e h: refs/heads/master i: 354643: 4417c374e03d3135d513ef91146e101370ff5efa v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/composite.c | 12 ++++++++++++ trunk/include/linux/usb/composite.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a9f708d8d341..6ac7eb1f114c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3249ca22c088c286d6227d8fae9c85a43a8ce9f6 +refs/heads/master: b473577854fea63055ff9ab84f0f52a3e8aed15e diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c index 4aa0e4652228..366facccf4f6 100644 --- a/trunk/drivers/usb/gadget/composite.c +++ b/trunk/drivers/usb/gadget/composite.c @@ -215,6 +215,18 @@ int usb_add_function(struct usb_configuration *config, } EXPORT_SYMBOL_GPL(usb_add_function); +void usb_remove_function(struct usb_configuration *c, struct usb_function *f) +{ + if (f->disable) + f->disable(f); + + bitmap_zero(f->endpoints, 32); + list_del(&f->list); + if (f->unbind) + f->unbind(c, f); +} +EXPORT_SYMBOL_GPL(usb_remove_function); + /** * usb_function_deactivate - prevent function and gadget enumeration * @function: the function that isn't yet ready to respond diff --git a/trunk/include/linux/usb/composite.h b/trunk/include/linux/usb/composite.h index 3834e3330b23..8c7a6295ae78 100644 --- a/trunk/include/linux/usb/composite.h +++ b/trunk/include/linux/usb/composite.h @@ -461,6 +461,7 @@ struct usb_configuration *usb_get_config(struct usb_composite_dev *cdev, int val); int usb_add_config_only(struct usb_composite_dev *cdev, struct usb_configuration *config); +void usb_remove_function(struct usb_configuration *c, struct usb_function *f); #define DECLARE_USB_FUNCTION(_name, _inst_alloc, _func_alloc) \ static struct usb_function_driver _name ## usb_func = { \