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

Commit fbc41e18 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_msm_hsic: Mark ignore_children for Runtime PM handling"

parents 8d1b727e 8ee2a41e

drivers/usb/gadget/ci13xxx_msm_hsic.c

+4 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static void ci13xxx_msm_hsic_notify_event(struct ci13xxx *udc, unsigned event) 
		if (mhsic->disable_on_boot)

			mhsic->disable_on_boot = false;

		/* bring HSIC core out of LPM */

		pm_runtime_get_sync(the_mhsic->dev);

		pm_runtime_resume(the_mhsic->dev);

		msm_hsic_start();

		the_mhsic->connected = true;

		break;
@@ -999,6 +999,9 @@ static int msm_hsic_probe(struct platform_device *pdev) 


	disable_irq(mhsic->async_irq_no);



	/* Driver manages its own runtime PM state. Ignore any chidren votes */

	pm_suspend_ignore_children(&pdev->dev, true);



	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);

drivers/usb/gadget/ci13xxx_udc.c

+2 −0
Original line number Diff line number Diff line
@@ -3524,9 +3524,11 @@ static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_active) 
		return 0;

	}

	if (is_active) {

		spin_unlock(udc->lock);

		if (udc->udc_driver->notify_event)

			udc->udc_driver->notify_event(udc,

				CI13XXX_CONTROLLER_CONNECT_EVENT);

		spin_lock(udc->lock);

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

	} else {

		hw_device_state(0);