Skip to content

Commit

Permalink
USB: composite: usb_composite_unregister() no longer __exit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Nazarewicz authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 8ea864c commit 915c8be
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/usb/gadget/composite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 915c8be

Please sign in to comment.