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

* linux-next: manual merge of the usb tree with the mfd tree
@ 2012-07-03  4:09 Stephen Rothwell
  2012-07-03 23:03 ` Greg KH
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2012-07-03  4:09 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Russ Dill, Samuel Ortiz

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]

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@canb.auug.org.au

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread