1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index a792e322f4f1..c588e8e486e5 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1001,7 +1001,6 @@ static int dummy_udc_remove(struct platform_device *pdev)
         struct dummy    *dum = platform_get_drvdata(pdev);
 
         usb_del_gadget_udc(&dum->gadget);
-        platform_set_drvdata(pdev, NULL);
         device_remove_file(&dum->gadget.dev, &dev_attr_function);
         return 0;
 }
@@ -2661,8 +2660,10 @@ static int __init init(void)
         }
         for (i = 0; i < mod_data.num; i++) {
                 dum[i] = kzalloc(sizeof(struct dummy), GFP_KERNEL);
-                if (!dum[i])
+                if (!dum[i]) {
+                        retval = -ENOMEM;
                         goto err_add_pdata;
+                }
                 retval = platform_device_add_data(the_hcd_pdev[i], &dum[i],
                                 sizeof(void *));
                 if (retval)