Merge "dwc3_otg: Increment dwc3 PM usage count unconditionally" (b9598ab6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3_otg.c

+15 −18

Original line number	Diff line number	Diff line
		/**
		* dwc3_otg.c - DesignWare USB3 DRD Controller OTG
		*
		* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -364,8 +364,8 @@ static void dwc3_ext_event_notify(struct usb_otg *otg,
		flush_delayed_work(&dotg->sm_work);

		if (event == DWC3_EVENT_PHY_RESUME) {
		if (pm_runtime_status_suspended(phy->dev) \|\|
		atomic_read(&phy->dev->power.usage_count) == 0) {
		if (!pm_runtime_status_suspended(phy->dev))
		dev_warn(phy->dev, "PHY_RESUME event out of LPM!!!!\n");

		dev_dbg(phy->dev, "ext PHY_RESUME event received\n");
		/* ext_xceiver would have taken h/w out of LPM by now */
		@@ -380,9 +380,6 @@ static void dwc3_ext_event_notify(struct usb_otg *otg,
		} else if (ret < 0) {
		dev_warn(phy->dev, "pm_runtime_get failed!\n");
		}
		} else {
		dev_warn(phy->dev, "PHY_RESUME event out of LPM!!!!\n");
		}
		} else if (event == DWC3_EVENT_XCEIV_STATE) {
		if (pm_runtime_status_suspended(phy->dev) \|\|
		atomic_read(&phy->dev->power.usage_count) == 0) {