Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364543
b: refs/heads/master
c: 002cb13
h: refs/heads/master
i:
  364541: ebb8d53
  364539: 9b5bc3f
  364535: 087d618
  364527: a609434
  364511: c67b125
  364479: 9a6bb75
  364415: a98d07a
  364287: 034af96
  364031: c52d921
  363519: 6ef3bf2
  362495: e1a0a1e
  360447: 3a4bf49
v: v3
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent a0305ab commit 0e4ad2a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b4ead05e7a3abf350d4ca1f7e0b71dc44f07f57
refs/heads/master: 002cb13f4a6f3c28510575922a226a7a09ab6e91
10 changes: 1 addition & 9 deletions trunk/drivers/usb/gadget/dummy_hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -983,16 +983,10 @@ static int dummy_udc_probe(struct platform_device *pdev)
dum->gadget.name = gadget_name;
dum->gadget.ops = &dummy_ops;
dum->gadget.max_speed = USB_SPEED_SUPER;
dum->gadget.register_my_device = true;

dev_set_name(&dum->gadget.dev, "gadget");
dum->gadget.dev.parent = &pdev->dev;
dum->gadget.dev.release = dummy_gadget_release;
rc = device_register(&dum->gadget.dev);
if (rc < 0) {
put_device(&dum->gadget.dev);
return rc;
}

init_dummy_udc_hw(dum);

rc = usb_add_gadget_udc(&pdev->dev, &dum->gadget);
Expand All @@ -1008,7 +1002,6 @@ static int dummy_udc_probe(struct platform_device *pdev)
err_dev:
usb_del_gadget_udc(&dum->gadget);
err_udc:
device_unregister(&dum->gadget.dev);
return rc;
}

Expand All @@ -1019,7 +1012,6 @@ static int dummy_udc_remove(struct platform_device *pdev)
usb_del_gadget_udc(&dum->gadget);
platform_set_drvdata(pdev, NULL);
device_remove_file(&dum->gadget.dev, &dev_attr_function);
device_unregister(&dum->gadget.dev);
return 0;
}

Expand Down

0 comments on commit 0e4ad2a

Please sign in to comment.