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

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

Merge "phy-msm-usb: Set pm_done to true only when usb is in lpm"

parents 2a1c7595 3ad23061

drivers/usb/phy/phy-msm-usb.c

+6 −1
Original line number Diff line number Diff line
@@ -2827,6 +2827,11 @@ static void msm_otg_sm_work(struct work_struct *w) 
			 */

			pm_runtime_mark_last_busy(otg->phy->dev);

			pm_runtime_autosuspend(otg->phy->dev);

			/*

			 * Set pm_done to true as part of USB disconnect

			 * only when USB is in low power mode.

			 */

			if (atomic_read(&motg->in_lpm))

				motg->pm_done = 1;

		}

		break;

include/linux/usb/msm_hsusb.h

+4 −1
Original line number Diff line number Diff line
@@ -370,7 +370,10 @@ struct msm_otg_platform_data { 
 * @chg_check_timer: The timer used to implement the workaround to detect

 *               very slow plug in of wall charger.

 * @ui_enabled: USB Intterupt is enabled or disabled.

 * @pm_done: Indicates whether USB is PM resumed

 * @pm_done: It is used to increment the pm counter using pm_runtime_get_sync.

	     This handles the race case when PM resume thread returns before

	     the charger detection starts. When USB is disconnected and in lpm

	     pm_done is set to true.

 * @ext_id_irq: IRQ for ID interrupt.

 */

struct msm_otg {