usb: composite: fix usb_function_activate/deactivate functions

Using usb_gadget_disconnect to make gadget temporarily invisible to host
doesn't provide desired result, because gadget is connected immediately
after binding regardless to previous usb_gadget_disconnect() calls.

For this reason we use usb_gadget_deactivate() instead of
usb_gadget_disconnect() to make it working as expected.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9ff3203b50e24b9179fb5fe8977d32b6aa813e9d..86d4e8fdf8d300c91f78191ef1aa7486384be2d1 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -279,7 +279,7 @@ int usb_function_deactivate(struct usb_function *function)
        spin_lock_irqsave(&cdev->lock, flags);
 
        if (cdev->deactivations == 0)
-               status = usb_gadget_disconnect(cdev->gadget);
+               status = usb_gadget_deactivate(cdev->gadget);
        if (status == 0)
                cdev->deactivations++;
 
@@ -311,7 +311,7 @@ int usb_function_activate(struct usb_function *function)
        else {
                cdev->deactivations--;
                if (cdev->deactivations == 0)
-                       status = usb_gadget_connect(cdev->gadget);
+                       status = usb_gadget_activate(cdev->gadget);
        }
 
        spin_unlock_irqrestore(&cdev->lock, flags);