usb: phy: msm: Unregister driver interest for VBUS and ID events

Message ID 1439884576-28467-1-git-send-email-ivan.ivanov@linaro.org
State New
Headers show

Commit Message

Ivan T. Ivanov Aug. 18, 2015, 7:56 a.m.
Right now even if driver failed to probe extcon framework will
still deliver its VBUS and ID events, which will lead to random
exception codes.

Fix this by removing driver interest for VBUS and ID events when
probe fail.

Fixes: 591fc116f330 ("usb: phy: msm: Use extcon framework for VBUS and ID detection")

Reported-by: Tim Bird <tim.bird@sonymobile.com>
Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
---
 drivers/usb/phy/phy-msm-usb.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Ivan T. Ivanov Sept. 7, 2015, 7:56 a.m. | #1
On Mon, 2015-08-24 at 10:11 -0700, Tim Bird wrote:
> On 08/18/2015 12:56 AM, Ivan T. Ivanov wrote:
> > Right now even if driver failed to probe extcon framework will
> > still deliver its VBUS and ID events, which will lead to random
> > exception codes.
> > 
> > Fix this by removing driver interest for VBUS and ID events when
> > probe fail.
> > 
> > Fixes: 591fc116f330 ("usb: phy: msm: Use extcon framework for VBUS and ID detection")
> > 
> > Reported-by: Tim Bird bird@sonymobile.com>
> > Signed-off-by: Ivan T. Ivanov ivanov@linaro.org>
> > ---
> >  drivers/usb/phy/phy-msm-usb.c | 26 +++++++++++++++++---------
> >  1 file changed, 17 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
> > index 00c49bb1bd29..a9082567f114 100644
> > --- a/drivers/usb/phy/phy-msm-usb.c
> > +++ b/drivers/usb/phy/phy-msm-usb.c
> > @@ -1581,6 +1581,8 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
> >                 ret = extcon_register_interest(&motg->id.conn, ext_id->name,
> >                                                                                                 "USB-HOST", &motg->id.nb);
> >                 if (ret < 0) {
> > +                       if (!IS_ERR(ext_vbus))
> > +                               extcon_unregister_interest(&motg->vbus.conn);
> >                         dev_err(&pdev->dev, "register ID notifier failed\n");
> >                         return ret;
> >                 }
> ...
> 
> This patch is obsoleted by commit 83b7b67c7, which changes the extcon API
> a bit (from register_interest to register_notifier, among other things).

Ah, sorry, missed this. New version is coming.

Regards,
Ivan
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 00c49bb1bd29..a9082567f114 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1581,6 +1581,8 @@  static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
 		ret = extcon_register_interest(&motg->id.conn, ext_id->name,
 					       "USB-HOST", &motg->id.nb);
 		if (ret < 0) {
+			if (!IS_ERR(ext_vbus))
+				extcon_unregister_interest(&motg->vbus.conn);
 			dev_err(&pdev->dev, "register ID notifier failed\n");
 			return ret;
 		}
@@ -1630,15 +1632,6 @@  static int msm_otg_probe(struct platform_device *pdev)
 	if (!motg)
 		return -ENOMEM;

-	pdata = dev_get_platdata(&pdev->dev);
-	if (!pdata) {
-		if (!np)
-			return -ENXIO;
-		ret = msm_otg_read_dt(pdev, motg);
-		if (ret)
-			return ret;
-	}
-
 	motg->phy.otg = devm_kzalloc(&pdev->dev, sizeof(struct usb_otg),
 				     GFP_KERNEL);
 	if (!motg->phy.otg)
@@ -1709,6 +1702,15 @@  static int msm_otg_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;

+	pdata = dev_get_platdata(&pdev->dev);
+	if (!pdata) {
+		if (!np)
+			return -ENXIO;
+		ret = msm_otg_read_dt(pdev, motg);
+		if (ret)
+			return ret;
+	}
+
 	motg->vddcx = regs[0].consumer;
 	motg->v3p3  = regs[1].consumer;
 	motg->v1p8  = regs[2].consumer;
@@ -1793,6 +1795,12 @@  disable_clks:
 	clk_disable_unprepare(motg->clk);
 	if (!IS_ERR(motg->core_clk))
 		clk_disable_unprepare(motg->core_clk);
+
+	if (motg->id.conn.edev)
+		extcon_unregister_interest(&motg->id.conn);
+	if (motg->vbus.conn.edev)
+		extcon_unregister_interest(&motg->vbus.conn);
+
 	return ret;
 }