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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120703140938.b2ae0cf0ce2a3a470bb6cec6@canb.auug.org.au>
Date:	Tue, 3 Jul 2012 14:09:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russ Dill <Russ.Dill@...il.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the mfd tree

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@...b.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

Content of type "application/pgp-signature" skipped