diff options
| author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2009-11-09 14:15:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 11:55:23 -0800 |
| commit | 915c8befccbe5d81d441b53ab7a9a98caf0c67d4 (patch) | |
| tree | 589d3b241d237a8a10729f2a39b05f9fba8dee86 | |
| parent | 8ea864cffdfd327117d4b7829935974b3f47ff31 (diff) | |
| download | linux-3.10-915c8befccbe5d81d441b53ab7a9a98caf0c67d4.tar.gz linux-3.10-915c8befccbe5d81d441b53ab7a9a98caf0c67d4.tar.bz2 linux-3.10-915c8befccbe5d81d441b53ab7a9a98caf0c67d4.zip | |
USB: composite: usb_composite_unregister() no longer __exit
Changed definition of usb_composite_unregister() function
removing __exit declaration. This way, the function is
included even if the whole code was not compiled as module.
This is required if a compiled-in code would like to
unregister a composite gadget.
Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/gadget/composite.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 8498f1a114d..09289bb1e20 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1092,7 +1092,8 @@ static struct usb_gadget_driver composite_driver = { .speed = USB_SPEED_HIGH, .bind = composite_bind, - .unbind = __exit_p(composite_unbind), + /* .unbind = __exit_p(composite_unbind), */ + .unbind = composite_unbind, .setup = composite_setup, .disconnect = composite_disconnect, @@ -1141,7 +1142,7 @@ int __init usb_composite_register(struct usb_composite_driver *driver) * This function is used to unregister drivers using the composite * driver framework. */ -void __exit usb_composite_unregister(struct usb_composite_driver *driver) +void /* __exit */ usb_composite_unregister(struct usb_composite_driver *driver) { if (composite != driver) return; |