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

Commit 80e27df0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: ci13xxx_udc: Send CONNECT_EVENT only when pull_up/vbus is enabled"

parents 5f687d3b 75b291da

drivers/usb/gadget/ci13xxx_udc.c

+9 −5
Original line number Diff line number Diff line
@@ -404,9 +404,6 @@ static int hw_device_state(u32 dma) 
		}

		hw_cwrite(CAP_ENDPTLISTADDR, ~0, dma);



		if (udc->udc_driver->notify_event)

			udc->udc_driver->notify_event(udc,

				CI13XXX_CONTROLLER_CONNECT_EVENT);



		/* Set BIT(31) to enable AHB2AHB Bypass functionality */

		if (udc->udc_driver->flags & CI13XXX_ENABLE_AHB2AHB_BYPASS) {
@@ -3556,6 +3553,9 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active) 
		if (is_active) {

			pm_runtime_get_sync(&_gadget->dev);

			hw_device_reset(udc);

			if (udc->udc_driver->notify_event)

				udc->udc_driver->notify_event(udc,

					CI13XXX_CONTROLLER_CONNECT_EVENT);

			if (udc->softconnect)

				hw_device_state(udc->ep0out.qh.dma);

		} else {
@@ -3603,10 +3603,14 @@ static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_active) 
		return ret;

	}



	if (is_active)

	if (is_active) {

		if (udc->udc_driver->notify_event)

			udc->udc_driver->notify_event(udc,

				CI13XXX_CONTROLLER_CONNECT_EVENT);

		hw_device_state(udc->ep0out.qh.dma);

	else

	} else {

		hw_device_state(0);

	}



	return 0;

}