All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>,
	Heiko Stuebner <heiko@sntech.de>,
	Tomeu Vizoso <tomeu.vizoso@collabora.com>,
	Amelie Delaunay <amelie.delaunay@st.com>,
	Minas Harutyunyan <hminas@synopsys.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-usb@vger.kernel.org
Subject: [PATCH] usb: dwc2: dwc2_vbus_supply_init: fix error check
Date: Thu, 22 Mar 2018 10:39:43 +0100	[thread overview]
Message-ID: <20180322093943.49717-1-tomeu.vizoso@collabora.com> (raw)

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>
---
 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)
+			return 0;
+		else
+			return PTR_ERR(hsotg->vbus_supply);
+	}
 
 	return regulator_enable(hsotg->vbus_supply);
 }
@@ -4342,9 +4347,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
 	spin_unlock_irqrestore(&hsotg->lock, flags);
 
-	dwc2_vbus_supply_init(hsotg);
-
-	return 0;
+	return dwc2_vbus_supply_init(hsotg);
 }
 
 /*
-- 
2.14.3

WARNING: multiple messages have this Message-ID (diff)
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>,
	Heiko Stuebner <heiko@sntech.de>,
	Tomeu Vizoso <tomeu.vizoso@collabora.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 10:39:43 +0100	[thread overview]
Message-ID: <20180322093943.49717-1-tomeu.vizoso@collabora.com> (raw)

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>
---
 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)
+			return 0;
+		else
+			return PTR_ERR(hsotg->vbus_supply);
+	}
 
 	return regulator_enable(hsotg->vbus_supply);
 }
@@ -4342,9 +4347,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
 	spin_unlock_irqrestore(&hsotg->lock, flags);
 
-	dwc2_vbus_supply_init(hsotg);
-
-	return 0;
+	return dwc2_vbus_supply_init(hsotg);
 }
 
 /*

             reply	other threads:[~2018-03-22  9:39 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-22  9:39 Tomeu Vizoso [this message]
2018-03-22  9:39 ` usb: dwc2: dwc2_vbus_supply_init: fix error check Tomeu Vizoso
2018-03-22 11:39 ` [PATCH] " Heiko Stübner
2018-03-22 11:39   ` Heiko Stuebner
2018-03-22 11:41   ` [PATCH] " Heiko Stübner
2018-03-22 11:41     ` Heiko Stuebner
2018-03-22 12:21     ` [PATCH] " Amelie DELAUNAY
2018-03-22 12:21       ` Amelie Delaunay
2018-03-22 13:06 ` [PATCH v2] " Tomeu Vizoso
2018-03-22 13:06   ` Tomeu Vizoso
2018-03-22 13:06   ` [v2] " Tomeu Vizoso
2018-03-22 13:14 ` [PATCH v3] " Tomeu Vizoso
2018-03-22 13:14   ` [v3] " Tomeu Vizoso
2018-03-22 13:26   ` [PATCH v3] " Heiko Stübner
2018-03-22 13:26     ` [v3] " Heiko Stuebner
2018-03-22 13:34     ` [PATCH v3] " Tomeu Vizoso
2018-03-22 13:34       ` [v3] " Tomeu Vizoso
2018-03-24  0:24   ` [PATCH v3] " kbuild test robot
2018-03-24  0:24     ` [v3] " kbuild test robot
2018-03-26  9:00 ` [PATCH v4] " Tomeu Vizoso
2018-03-26  9:00   ` [v4] " Tomeu Vizoso
2018-03-26 10:56   ` [PATCH v4] " Amelie DELAUNAY
2018-03-26 10:56     ` [v4] " Amelie Delaunay
2018-03-26 11:51   ` [PATCH v4] " Heiko Stübner
2018-03-26 11:51     ` [v4] " Heiko Stuebner
2018-04-04 13:33     ` [PATCH v4] " Tomeu Vizoso
2018-04-04 13:33       ` [v4] " Tomeu Vizoso
2018-04-05  7:54   ` [PATCH v4] " Minas Harutyunyan
2018-04-05  7:54     ` [v4] " Minas Harutyunyan
2018-04-05  8:10     ` [PATCH v4] " Tomeu Vizoso
2018-04-05  8:10       ` [v4] " Tomeu Vizoso
2018-04-05  9:02       ` [PATCH v4] " Grigor Tovmasyan
2018-04-05  9:02         ` [v4] " Grigor Tovmasyan
2018-04-05  8:58   ` [PATCH v4] " Grigor Tovmasyan
2018-04-05  8:58     ` [v4] " Grigor Tovmasyan
2018-04-05  9:51     ` [PATCH v4] " Minas Harutyunyan
2018-04-05  9:51       ` [v4] " Minas Harutyunyan
2018-04-10 12:28   ` [PATCH v4] " Heiko Stuebner
2018-04-10 12:28     ` [v4] " Heiko Stuebner
2018-04-10 13:52     ` [PATCH v4] " Minas Harutyunyan
2018-04-10 13:52       ` [v4] " Minas Harutyunyan
2018-04-10 15:37       ` [PATCH v4] " Heiko Stübner
2018-04-10 15:37         ` [v4] " Heiko Stuebner
2018-04-11  6:50         ` [PATCH v4] " Minas Harutyunyan
2018-04-11  6:50           ` [v4] " Minas Harutyunyan
2018-04-23 13:24           ` [PATCH v4] " Tomeu Vizoso
2018-04-23 13:24             ` [v4] " Tomeu Vizoso
2018-04-24  8:58             ` [PATCH v4] " Heiko Stübner
2018-04-24  8:58               ` [v4] " Heiko Stuebner

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=20180322093943.49717-1-tomeu.vizoso@collabora.com \
    --to=tomeu.vizoso@collabora.com \
    --cc=amelie.delaunay@st.com \
    --cc=felipe.balbi@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heiko@sntech.de \
    --cc=hminas@synopsys.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /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 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.