USB: g_mass_storage: thread_exits callback added
thread_exits callback has been added to fsg_common structure.
This callback is called when MSF's thread exits (is terminated
by a signal or function is unregistered). It's then gadget's
responsibility to unregister the gadget.
Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index e43ca8f..19619fb 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -132,9 +132,13 @@
};
FSG_MODULE_PARAMETERS(/* no prefix */, mod_data);
+static unsigned long msg_registered = 0;
+static void msg_cleanup(void);
+
static int __init msg_do_config(struct usb_configuration *c)
{
struct fsg_common *common;
+ struct fsg_config config;
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
@@ -142,7 +146,9 @@
c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
- common = fsg_common_from_params(0, c->cdev, &mod_data);
+ fsg_config_from_params(&config, &mod_data);
+ config.thread_exits = (void(*)(struct fsg_common*))&msg_cleanup;
+ common = fsg_common_init(0, c->cdev, &config);
if (IS_ERR(common))
return PTR_ERR(common);
@@ -201,11 +207,7 @@
return status;
dev_info(&gadget->dev, DRIVER_DESC ", version: " DRIVER_VERSION "\n");
- return 0;
-}
-
-static int __exit msg_unbind(struct usb_composite_dev *cdev)
-{
+ set_bit(0, &msg_registered);
return 0;
}
@@ -218,7 +220,6 @@
.dev = &msg_device_desc,
.strings = dev_strings,
.bind = msg_bind,
- .unbind = __exit_p(msg_unbind),
};
MODULE_DESCRIPTION(DRIVER_DESC);
@@ -231,8 +232,9 @@
}
module_init(msg_init);
-static void __exit msg_cleanup(void)
+static void msg_cleanup(void)
{
- usb_composite_unregister(&msg_driver);
+ if (test_and_clear_bit(0, &msg_registered))
+ usb_composite_unregister(&msg_driver);
}
module_exit(msg_cleanup);