Merge "usb: ehci-msm: Don't call ehci_suspend during system suspend"

/* ehci-msm.c - HSUSB Host Controller Driver Implementation

 *

 * Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.

 *

 * Partly derived from ehci-fsl.c and ehci-hcd.c

 * Copyright (c) 2000-2004 by David Brownell

static int ehci_msm_pm_suspend(struct device *dev)

{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	bool do_wakeup = device_may_wakeup(dev);

	int ret;

	dev_dbg(dev, "ehci-msm PM suspend\n");

	if (!hcd->rh_registered)

		return 0;

	ret = ehci_suspend(hcd, do_wakeup);

	if (ret)

		return ret;

	return usb_phy_set_suspend(phy, 1);

}