Skip to contentSkip to conversation

usb: gadget: dummy_hcd: Fix error path

PATCH In review Rahul Ruikar 2 participants 4 messages Oct 2, 2010 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: dummy_hcd: Fix error path

In function dummy_udc_probe()
call put_device() when device_register() fails.

---
 drivers/usb/gadget/dummy_hcd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/gadget/dummy_hcd.c +3 -1
index dc65462..2548091 100644
@@ -885,8 +885,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));
 
Signature · 1 line
1.7.2.3
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Rahul Ruikar

In function dummy_udc_probe()
call put_device() when device_register() fails.

---
 drivers/usb/gadget/dummy_hcd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/gadget/dummy_hcd.c +0 -0
index dc65462..2548091 100644

drivers/usb/gadget/dummy_hcd.c static int dummy_udc_probe (struct platform_device *pdev) · line 893

Quoted 10 lines
drivers/usb/gadget/dummy_hcd.c +3 -1
@@ -885,8 +885,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));

Similar changes are needed in net2280.c, file_storage.c and f_mass_storage.c, probably also in goku_udc.c and langwell_udc.c. Would you like to make them?

Alan Stern

#2 lore raw
Quoted 24 lines · Alan Stern
Quoted 22 lines · Rahul Ruikar

In function dummy_udc_probe()
call put_device() when device_register() fails.

---
 drivers/usb/gadget/dummy_hcd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/gadget/dummy_hcd.c +3 -1
index dc65462..2548091 100644
@@ -885,8 +885,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;
+	}
 
Quoted 3 lines

drivers/usb/gadget/dummy_hcd.c static int dummy_udc_probe (struct platform_device *pdev) · line 893

Quoted 1 line
drivers/usb/gadget/dummy_hcd.c +0 -0
 	usb_get_hcd (dummy_to_hcd (dum));

I take this back. The call usb_get_hcd needs to be moved up before the device_register (maybe to the start of the function.) Otherwise dummy_gadget_release would do an unbalanced usb_put_hcd.

Alan Stern

#3 lore raw
In reply to Alan Stern
Quoted 24 lines · Alan Stern
Quoted 22 lines · Rahul Ruikar

In function dummy_udc_probe()
call put_device() when device_register() fails.

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

 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/gadget/dummy_hcd.c +3 -1
index dc65462..2548091 100644
@@ -885,8 +885,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;
+     }
 
Quoted 8 lines

drivers/usb/gadget/dummy_hcd.c static int dummy_udc_probe (struct platform_device *pdev) · line 893

Quoted 1 line
drivers/usb/gadget/dummy_hcd.c +0 -0
       usb_get_hcd (dummy_to_hcd (dum));

Similar changes are needed in net2280.c, file_storage.c and f_mass_storage.c, probably also in goku_udc.c and langwell_udc.c. Would you like to make them?

yes Alan, I am aware of changes needed in these files. actually there are many other changes needed for these files ( apart from device_register() failure.. ) I am working on these files. also this current patch need some updates.

Thanks,
Rahul

Quoted 3 lines

Alan Stern