Skip to contentSkip to conversation

usb: gadget: goku_udc: Fix error path

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

lore
Share & tools
lore
#0 lore raw

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

call put_device() when device_register() fails.

---
 drivers/usb/gadget/goku_udc.c |    7 ++++++-
 drivers/usb/gadget/goku_udc.h |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/usb/gadget/goku_udc.c +6 -1
index 1088d08..080779b 100644
@@ -1847,8 +1847,13 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	/* done */
 	the_controller = dev;
 	retval = device_register(&dev->gadget.dev);
-	if (retval == 0)
+	if (retval != 0) {
+		dev_reg_status = 2;
+		goto done;
+	} else {
+		dev_reg_status = 1;
 		return 0;
+	}
 
 done:
 	if (dev)
drivers/usb/gadget/goku_udc.h +2 -1
index 566cb23..c27b9e2 100644
@@ -251,7 +251,8 @@ struct goku_udc {
 					got_region:1,
 					req_config:1,
 					configured:1,
-					enabled:1;
+					enabled:1,
+					dev_reg_status:2;
 
 	/* pci state used to access those endpoints */
 	struct pci_dev			*pdev;
Signature · 1 line
1.7.2.3
#1 lore raw
Quoted 2 lines · Rahul Ruikar

call put_device() when device_register() fails.

Huh? I don't see any calls to put_device() in your patch.

regards,
dan carpenter

Quoted 41 lines
---
 drivers/usb/gadget/goku_udc.c |    7 ++++++-
 drivers/usb/gadget/goku_udc.h |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/usb/gadget/goku_udc.c +6 -1
index 1088d08..080779b 100644
@@ -1847,8 +1847,13 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	/* done */
 	the_controller = dev;
 	retval = device_register(&dev->gadget.dev);
-	if (retval == 0)
+	if (retval != 0) {
+		dev_reg_status = 2;
+		goto done;
+	} else {
+		dev_reg_status = 1;
 		return 0;
+	}
 
 done:
 	if (dev)
drivers/usb/gadget/goku_udc.h +2 -1
index 566cb23..c27b9e2 100644
@@ -251,7 +251,8 @@ struct goku_udc {
 					got_region:1,
 					req_config:1,
 					configured:1,
-					enabled:1;
+					enabled:1,
+					dev_reg_status:2;
 
 	/* pci state used to access those endpoints */
 	struct pci_dev			*pdev;
Signature · 1 line
1.7.2.3
#2 lore raw
In reply to Rahul Ruikar

Hello.

Quoted 3 lines · Rahul Ruikar

call put_device() when device_register() fails.

[...]

Quoted 5 lines
drivers/usb/gadget/goku_udc.c +0 -0
index 1088d08..080779b 100644

drivers/usb/gadget/goku_udc.c static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 1854

Quoted 9 lines
drivers/usb/gadget/goku_udc.c +5 -1
@@ -1847,8 +1847,13 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  	/* done */
  	the_controller = dev;
  	retval = device_register(&dev->gadget.dev);
-	if (retval == 0)
+	if (retval != 0) {
+		dev_reg_status = 2;
+		goto done;
+	} else {
+		dev_reg_status = 1;

Did you mean 'dev->dev_reg_status'?

Quoted 10 lines
drivers/usb/gadget/goku_udc.c +1 -0
  		return 0;
+	}
 
  done:
  	if (dev)
drivers/usb/gadget/goku_udc.h +0 -0
index 566cb23..c27b9e2 100644

drivers/usb/gadget/goku_udc.h struct goku_udc { · line 255

Quoted 6 lines
drivers/usb/gadget/goku_udc.h +2 -1
@@ -251,7 +251,8 @@ struct goku_udc {
  					got_region:1,
  					req_config:1,
  					configured:1,
-					enabled:1;
+					enabled:1,
+					dev_reg_status:2;

I don't see where this new field is read in your patch...

WBR, Sergei

#3 lore raw

Sergei,

Please ignore this particular patch.. I resubmitted this in another mail

Thanks,
- Rahul Ruikar

Quoted 49 lines · Sergei Shtylyov

Hello.

Quoted 3 lines · Rahul Ruikar

call put_device() when device_register() fails.

[...]

Quoted 6 lines
drivers/usb/gadget/goku_udc.c +0 -0
index 1088d08..080779b 100644

drivers/usb/gadget/goku_udc.c static int goku_probe(struct pci_dev *pdev, const · line 1855

Quoted 10 lines
drivers/usb/gadget/goku_udc.c +5 -1
@@ -1847,8 +1847,13 @@ static int goku_probe(struct pci_dev *pdev, const
 struct pci_device_id *id)
        /* done */
        the_controller = dev;
        retval = device_register(&dev->gadget.dev);
-       if (retval == 0)
+       if (retval != 0) {
+               dev_reg_status = 2;
+               goto done;
+       } else {
+               dev_reg_status = 1;

  Did you mean 'dev->dev_reg_status'?

Quoted 10 lines
drivers/usb/gadget/goku_udc.c +1 -0
                return 0;
+       }
 

 done:
       if (dev)

drivers/usb/gadget/goku_udc.h +0 -0
index 566cb23..c27b9e2 100644

drivers/usb/gadget/goku_udc.h struct goku_udc { · line 255

Quoted 6 lines
drivers/usb/gadget/goku_udc.h +2 -1
@@ -251,7 +251,8 @@ struct goku_udc {
                                        got_region:1,
                                        req_config:1,
                                        configured:1,
-                                       enabled:1;
+                                       enabled:1,
+                                       dev_reg_status:2;

  I don't see where this new field is read in your patch...

WBR, Sergei