]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
usb: gadget: dummy_hcd: Fix error path
authorRahul Ruikar <rahul.ruikar@gmail.com>
Thu, 7 Oct 2010 04:10:45 +0000 (09:40 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Oct 2010 17:22:06 +0000 (10:22 -0700)
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.

Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/dummy_hcd.c

index 7bb9d78aac2736cae940360189fbf64dcb3900b8..1d2a2abbfa803e16ba5cb0d4a7f1bd010eca268e 100644 (file)
@@ -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);