LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@avionic-design.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thierry Reding <thierry@gilfi.de>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Thu, 4 Apr 2013 08:27:30 +0200	[thread overview]
Message-ID: <20130404062730.GA4806@avionic-0098.mockup.avionic-design.de> (raw)
In-Reply-To: <20130404151845.406517e19f29380ccb90ac35@canb.auug.org.au>

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

On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
> ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
> 4261b8f3538c ("usb: host: ehci-tegra: fix PHY error handling") from the
> usb-gadget tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/usb/host/ehci-tegra.c
> index 4f3cfb8,1d2488c..0000000
> --- a/drivers/usb/host/ehci-tegra.c
> +++ b/drivers/usb/host/ehci-tegra.c
> @@@ -770,19 -765,15 +770,17 @@@ static int tegra_ehci_probe(struct plat
>   	if (!irq) {
>   		dev_err(&pdev->dev, "Failed to get IRQ\n");
>   		err = -ENODEV;
>  -		goto fail;
>  +		goto fail_phy;
>   	}
>   
>   	if (pdata->operating_mode == TEGRA_USB_OTG) {
>   		tegra->transceiver =
>   			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
> - 		if (!IS_ERR_OR_NULL(tegra->transceiver))
> + 		if (!IS_ERR(tegra->transceiver))
>   			otg_set_host(tegra->transceiver->otg, &hcd->self);
>  +	} else {
>  +		tegra->transceiver = ERR_PTR(-ENODEV);
>   	}
> - #endif
>   
>   	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
>   	if (err) {
> @@@ -801,11 -792,8 +799,9 @@@
>   	return err;
>   
>   fail:
> - #ifdef CONFIG_USB_OTG_UTILS
> - 	if (!IS_ERR_OR_NULL(tegra->transceiver))
> + 	if (!IS_ERR(tegra->transceiver))
>   		otg_set_host(tegra->transceiver->otg, NULL);
> - #endif
>  +fail_phy:
>   	usb_phy_shutdown(hcd->phy);
>   fail_io:
>   	clk_disable_unprepare(tegra->clk);

Looks good to me, thanks.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2013-04-04  6:27 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04  4:18 Stephen Rothwell
2013-04-04  6:27 ` Thierry Reding [this message]
2013-04-04  7:08   ` Felipe Balbi
2013-08-02  6:38 Stephen Rothwell
2013-08-02  7:23 ` Felipe Balbi
2014-04-28  5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2014-11-06  3:58 Stephen Rothwell
2014-11-06  4:59 ` Felipe Balbi
2017-04-07  4:41 Stephen Rothwell
2017-04-07  4:45 Stephen Rothwell
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19  7:37   ` Felipe Balbi
2017-10-18 14:49 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-18 16:04   ` Mark Brown
2018-05-17  4:03 Stephen Rothwell
2018-05-17  7:07 ` Greg KH
2020-03-16  3:23 Stephen Rothwell
2020-03-16  7:25 ` Greg KH
2020-03-16  8:18 ` Greg KH
2020-05-21  7:21 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130404062730.GA4806@avionic-0098.mockup.avionic-design.de \
    --to=thierry.reding@avionic-design.de \
    --cc=balbi@ti.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=thierry@gilfi.de \
    --subject='Re: linux-next: manual merge of the usb-gadget tree with the usb tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).