From: Heiko Stuebner <heiko@sntech.de>
To: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: linux-kernel@vger.kernel.org,
Felipe Balbi <felipe.balbi@linux.intel.com>,
Amelie Delaunay <amelie.delaunay@st.com>,
Minas Harutyunyan <hminas@synopsys.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org
Subject: usb: dwc2: dwc2_vbus_supply_init: fix error check
Date: Thu, 22 Mar 2018 12:41:38 +0100 [thread overview]
Message-ID: <3806387.a3O5bOALIr@diego> (raw)
Hi Tomeu,
Am Donnerstag, 22. März 2018, 12:39:13 CET schrieb Heiko Stübner:
> Am Donnerstag, 22. März 2018, 10:39:43 CET schrieb Tomeu Vizoso:
> > devm_regulator_get_optional returns -ENODEV if the regulator isn't
> > there, so if that's the case we have to make sure not to leave -ENODEV
> > in the regulator pointer.
> >
> > Also, make sure we return 0 in that case, but correctly propagate any
> > other errors. Also propagate the error from _dwc2_hcd_start.
> >
> > Fixes: 531ef5ebea96 ("usb: dwc2: add support for host mode external vbus
> > supply") Cc: Amelie Delaunay <amelie.delaunay@st.com>
> > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>
> Thanks for catching that oops in your tests.
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
I take that back :-)
see below
> > ---
> >
> > drivers/usb/dwc2/hcd.c | 13 ++++++++-----
> > 1 file changed, 8 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> > index dcfda5eb4cac..4ae211f65e85 100644
> > --- a/drivers/usb/dwc2/hcd.c
> > +++ b/drivers/usb/dwc2/hcd.c
> > @@ -359,8 +359,13 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg
> > *hsotg) static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
> >
> > {
> >
> > hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
> >
> > - if (IS_ERR(hsotg->vbus_supply))
> > - return 0;
> > + if (IS_ERR(hsotg->vbus_supply)) {
> > + hsotg->vbus_supply = NULL;
> > + if (PTR_ERR(hsotg->vbus_supply) == -ENODEV)
hsotg->vbus_supply is already NULL here
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next reply other threads:[~2018-03-22 11:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 11:41 Heiko Stuebner [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-22 12:21 usb: dwc2: dwc2_vbus_supply_init: fix error check Amelie Delaunay
2018-03-22 11:39 Heiko Stuebner
2018-03-22 9:39 Tomeu Vizoso
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=3806387.a3O5bOALIr@diego \
--to=heiko@sntech.de \
--cc=amelie.delaunay@st.com \
--cc=felipe.balbi@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hminas@synopsys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=tomeu.vizoso@collabora.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).