* linux-next: manual merge of the usb tree with the mfd tree
@ 2012-07-10 5:51 Stephen Rothwell
2012-07-10 15:12 ` Alan Stern
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2012-07-10 5:51 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Russ Dill, Samuel Ortiz, Alan Stern
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix
the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from
the usb tree.
I am not sure how to fix this up, I have just effectively reverted the
effect of the former commit on this file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mfd tree
2012-07-10 5:51 linux-next: manual merge of the usb tree with the mfd tree Stephen Rothwell
@ 2012-07-10 15:12 ` Alan Stern
0 siblings, 0 replies; 5+ messages in thread
From: Alan Stern @ 2012-07-10 15:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Russ Dill, Samuel Ortiz
On Tue, 10 Jul 2012, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix
> the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
> commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from
> the usb tree.
>
> I am not sure how to fix this up, I have just effectively reverted the
> effect of the former commit on this file.
That agrees with Greg's decision. Russ's patch (commit 2761a6) should
be rebased on top of 1a49e2.
Thanks,
Alan Stern
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mfd tree
@ 2012-07-10 15:12 ` Alan Stern
0 siblings, 0 replies; 5+ messages in thread
From: Alan Stern @ 2012-07-10 15:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Russ Dill, Samuel Ortiz
On Tue, 10 Jul 2012, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix
> the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
> commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from
> the usb tree.
>
> I am not sure how to fix this up, I have just effectively reverted the
> effect of the former commit on this file.
That agrees with Greg's decision. Russ's patch (commit 2761a6) should
be rebased on top of 1a49e2.
Thanks,
Alan Stern
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 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, 0 replies; 5+ messages in thread
From: Greg KH @ 2012-07-03 23:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russ Dill, Samuel Ortiz
On Tue, Jul 03, 2012 at 02:09:38PM +1000, Stephen Rothwell wrote:
> 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.
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* 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
end of thread, other threads:[~2012-07-10 15:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-10 5:51 linux-next: manual merge of the usb tree with the mfd tree Stephen Rothwell
2012-07-10 15:12 ` Alan Stern
2012-07-10 15:12 ` Alan Stern
-- strict thread matches above, loose matches on Subject: below --
2012-07-03 4:09 Stephen Rothwell
2012-07-03 23:03 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.