Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 915c8bef authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8ea864cf

drivers/usb/gadget/composite.c

+3 −2
Original line number Diff line number Diff line
@@ -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;