Skip to contentSkip to conversation

usb: gadget: dummy_hcd: Fix error path

RESEND/PATCH Rahul Ruikar 2 participants 4 messages Oct 2, 2010 – Oct 7, 2010 USB

lore
Share & tools
lore
#0 lore raw

In function dummy_udc_probe()
call put_device() when device_register() fails.
also usb_get_hcd() put before device_register() after review comment from Alan Stern.

---
 drivers/usb/gadget/dummy_hcd.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/gadget/dummy_hcd.c +5 -3
index dc65462..9b30483 100644
@@ -874,6 +874,8 @@ static int dummy_udc_probe (struct platform_device *pdev)
 	struct dummy	*dum = the_controller;
 	int		rc;
 
+	usb_get_hcd(dummy_to_hcd(dum));
+
 	dum->gadget.name = gadget_name;
 	dum->gadget.ops = &dummy_ops;
 	dum->gadget.is_dualspeed = 1;
@@ -885,10 +887,10 @@ static int dummy_udc_probe (struct platform_device *pdev)
 	dum->gadget.dev.parent = &pdev->dev;
 	dum->gadget.dev.release = dummy_gadget_release;
 	rc = device_register (&dum->gadget.dev);
-	if (rc < 0)
+	if (rc < 0) {
+		put_device(&dum->gadget.dev);
 		return rc;
-
-	usb_get_hcd (dummy_to_hcd (dum));
+	}
 
 	platform_set_drvdata (pdev, dum);
 	rc = device_create_file (&dum->gadget.dev, &dev_attr_function);
Signature · 1 line
1.7.2.3
#1 lore raw

updated patch attached here.

- Rahul Ruikar

Quoted 38 lines · Rahul Ruikar

In function dummy_udc_probe()
call put_device() when device_register() fails.
also usb_get_hcd() put before device_register() after review comment from Alan Stern.

---
 drivers/usb/gadget/dummy_hcd.c |    8 +++++---

 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/gadget/dummy_hcd.c +5 -4
index dc65462..9b30483 100644
@@ -874,6 +874,8 @@ static int dummy_udc_probe (struct platform_device *pdev)
        struct dummy    *dum = the_controller;
        int             rc;
 
+       usb_get_hcd(dummy_to_hcd(dum));
+
        dum->gadget.name = gadget_name;
        dum->gadget.ops = &dummy_ops;
        dum->gadget.is_dualspeed = 1;
@@ -885,10 +887,10 @@ static int dummy_udc_probe (struct platform_device *pdev)
        dum->gadget.dev.parent = &pdev->dev;
        dum->gadget.dev.release = dummy_gadget_release;
        rc = device_register (&dum->gadget.dev);
-       if (rc < 0)
+       if (rc < 0) {
+               put_device(&dum->gadget.dev);
                return rc;
-
-       usb_get_hcd (dummy_to_hcd (dum));
+       }
 
        platform_set_drvdata (pdev, dum);
        rc = device_create_file (&dum->gadget.dev, &dev_attr_function);
--
Quoted 3 lines

1.7.2.3

From 50883d4df7f36bf9b87c8836ebd7de15fc7ac900 Mon Sep 17 00:00:00 2001
From: Rahul Ruikar <[email protected]>
Date: Sat, 2 Oct 2010 20:34:34 +0530
Subject: [RESEND/PATCH] usb: gadget: dummy_hcd: Fix error path

In function dummy_udc_probe()
call put_device() when device_register() fails.
also usb_get_hcd() put before device_register() after review comment from Alan Stern.

---
 drivers/usb/gadget/dummy_hcd.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/gadget/dummy_hcd.c +5 -3
index dc65462..9b30483 100644
@@ -874,6 +874,8 @@ static int dummy_udc_probe (struct platform_device *pdev)
 	struct dummy	*dum = the_controller;
 	int		rc;
 
+	usb_get_hcd(dummy_to_hcd(dum));
+
 	dum->gadget.name = gadget_name;
 	dum->gadget.ops = &dummy_ops;
 	dum->gadget.is_dualspeed = 1;
@@ -885,10 +887,10 @@ static int dummy_udc_probe (struct platform_device *pdev)
 	dum->gadget.dev.parent = &pdev->dev;
 	dum->gadget.dev.release = dummy_gadget_release;
 	rc = device_register (&dum->gadget.dev);
-	if (rc < 0)
+	if (rc < 0) {
+		put_device(&dum->gadget.dev);
 		return rc;
-
-	usb_get_hcd (dummy_to_hcd (dum));
+	}
 
 	platform_set_drvdata (pdev, dum);
 	rc = device_create_file (&dum->gadget.dev, &dev_attr_function);
Signature · 1 line
1.7.2.3
#2 lore raw
Quoted 1 line · Rahul Ruikar

updated patch attached here.

It's attached in base64 mode, sorry, I can't apply it. Please resend it properly.

greg k-h

#3 lore raw

sent in another mail.

- Rahul Ruikar

Quoted 8 lines · Greg KH
Quoted 1 line · Rahul Ruikar

updated patch attached here.

It's attached in base64 mode, sorry, I can't apply it.  Please resend it properly.

greg k-h