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

Commit 7ad40e52 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3-msm: Remove redundant dwc3_msm_suspend call"

parents 58803a6c 54e691ed
Loading
Loading
Loading
Loading
+2 −5
Original line number Original line Diff line number Diff line
@@ -4381,7 +4381,6 @@ static void dwc3_otg_sm_work(struct work_struct *w)
#ifdef CONFIG_PM_SLEEP
#ifdef CONFIG_PM_SLEEP
static int dwc3_msm_pm_suspend(struct device *dev)
static int dwc3_msm_pm_suspend(struct device *dev)
{
{
	int ret = 0;
	struct dwc3_msm *mdwc = dev_get_drvdata(dev);
	struct dwc3_msm *mdwc = dev_get_drvdata(dev);
	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);
	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);


@@ -4394,11 +4393,9 @@ static int dwc3_msm_pm_suspend(struct device *dev)
		return -EBUSY;
		return -EBUSY;
	}
	}


	ret = dwc3_msm_suspend(mdwc);
	if (!ret)
	atomic_set(&mdwc->pm_suspended, 1);
	atomic_set(&mdwc->pm_suspended, 1);


	return ret;
	return 0;
}
}


static int dwc3_msm_pm_resume(struct device *dev)
static int dwc3_msm_pm_resume(struct device *dev)