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

Commit 5601250b authored by Robert Baldyga's avatar Robert Baldyga Committed by Felipe Balbi
Browse files

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: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent ccdf138f

drivers/usb/gadget/composite.c

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