From 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 24 Jan 2013 16:10:16 +0200 Subject: [PATCH] --- yaml --- r: 364543 b: refs/heads/master c: 002cb13f4a6f3c28510575922a226a7a09ab6e91 h: refs/heads/master i: 364541: ebb8d53dfa95ae63cb11902ac85ddb884504d422 364539: 9b5bc3fe74df832236c7ca193298942178a1c541 364535: 087d618e78c3dd462b6697fb29a10e5ed8cd2f5b 364527: a6094343b1f83b0f1f411dfc7dbac751d3ce5223 364511: c67b125c0a52a7311137df768d7247c56c3e8acf 364479: 9a6bb7514552141a3c957bbcf307938c92b0c3e2 364415: a98d07a86f1389fa4555f81f956730c1e8443073 364287: 034af96b57df450eb6a8acab04e9850878167a7f 364031: c52d921fce9e6bc499f995f5421787cc72701697 363519: 6ef3bf2c2872fd85e054f16fa04a3a4d40e83713 362495: e1a0a1e1ac1b3091aa497e4f7589c8e08ec128d7 360447: 3a4bf497e7a843cc50db413d30171c18d46750c0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/dummy_hcd.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1451c936416d..8373bd9de104 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b4ead05e7a3abf350d4ca1f7e0b71dc44f07f57 +refs/heads/master: 002cb13f4a6f3c28510575922a226a7a09ab6e91 diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c index 8cf0c0f6fa1f..a6950aa8f3be 100644 --- a/trunk/drivers/usb/gadget/dummy_hcd.c +++ b/trunk/drivers/usb/gadget/dummy_hcd.c @@ -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); @@ -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; } @@ -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; }