USB: composite: Add usb_composite_force_reset utility to force enumeration
Use this rather than calling usb_gadget_disconnect and usb_gadget_connect
directly to avoid sending USB disconnect events to userspace when resetting
the bus.
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 7618a07..c7a5478 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -337,7 +337,7 @@
*/
list_for_each_entry(func, &android_config_driver.functions, list) {
if (!strcmp(func->name, "usb_mass_storage")) {
- usb_function_set_enabled(f, !enable);
+ usb_function_set_enabled(func, !enable);
break;
}
}
@@ -348,14 +348,7 @@
device_desc.idProduct = __constant_cpu_to_le16(product_id);
if (dev->cdev)
dev->cdev->desc.idProduct = device_desc.idProduct;
-
- /* force reenumeration */
- if (dev->cdev && dev->cdev->gadget &&
- dev->cdev->gadget->speed != USB_SPEED_UNKNOWN) {
- usb_gadget_disconnect(dev->cdev->gadget);
- msleep(10);
- usb_gadget_connect(dev->cdev->gadget);
- }
+ usb_composite_force_reset(dev->cdev);
}
}