linux-next: manual merge of the usb tree with the mfd tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-omap.c between commit 996439f8fa07 ("mfd: USB: Fix
the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
commit 984e97483a14 ("ARM: OMAP: USB: Fixup ehci_hcd_omap_probe error
path") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/host/ehci-omap.c
index c304354,6e15fc8..0000000
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@@ -329,11 -330,6 +329,11 @@@ static int ehci_hcd_omap_probe(struct p
  	omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params);
  
  	ehci_reset(omap_ehci);
 +	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
 +	if (ret) {
 +		dev_err(dev, "failed to add hcd with err %d\n", ret);
- 		goto err_add_hcd;
++		goto err_pm_runtime;
 +	}
  
  	if (pdata->phy_reset) {
  		/* Hold the PHY in RESET for enough time till

Attachment: pgp00000.pgp
Description: PGP signature