From 5b44d359d63dbb9a3d3716f439aa315f968a2d3a Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 24 Jan 2013 17:04:56 +0200
Subject: [PATCH] --- yaml --- r: 364559 b: refs/heads/master c:
 40ed30cff5957d15dcd2638c6f48fae839a3100a h: refs/heads/master i:   364557:
 254f23e0d4a32f64662452be40100c8285252d75   364555:
 3ed4e2b55a05a37195f33ec9457a5298dbc5c63b   364551:
 fc1f961b41cdb00afd5174d804c09439a993493c   364543:
 0e4ad2a9b4f550caa3691e3c20af2d249b6a3d04 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/s3c-hsudc.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8d991114024f..5cf8c3bdc8a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d833a327aaed6637398446ec8a3e555b3ddd11
+refs/heads/master: 40ed30cff5957d15dcd2638c6f48fae839a3100a
diff --git a/trunk/drivers/usb/gadget/s3c-hsudc.c b/trunk/drivers/usb/gadget/s3c-hsudc.c
index 458965a1b138..c4ff747f53fc 100644
--- a/trunk/drivers/usb/gadget/s3c-hsudc.c
+++ b/trunk/drivers/usb/gadget/s3c-hsudc.c
@@ -1303,18 +1303,16 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
 	spin_lock_init(&hsudc->lock);
 
-	dev_set_name(&hsudc->gadget.dev, "gadget");
-
 	hsudc->gadget.max_speed = USB_SPEED_HIGH;
 	hsudc->gadget.ops = &s3c_hsudc_gadget_ops;
 	hsudc->gadget.name = dev_name(dev);
 	hsudc->gadget.dev.parent = dev;
 	hsudc->gadget.dev.dma_mask = dev->dma_mask;
 	hsudc->gadget.ep0 = &hsudc->ep[0].ep;
-
 	hsudc->gadget.is_otg = 0;
 	hsudc->gadget.is_a_peripheral = 0;
 	hsudc->gadget.speed = USB_SPEED_UNKNOWN;
+	hsudc->gadget.register_my_device = true;
 
 	s3c_hsudc_setup_ep(hsudc);
 
@@ -1345,12 +1343,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 	disable_irq(hsudc->irq);
 	local_irq_enable();
 
-	ret = device_register(&hsudc->gadget.dev);
-	if (ret) {
-		put_device(&hsudc->gadget.dev);
-		goto err_add_device;
-	}
-
 	ret = usb_add_gadget_udc(&pdev->dev, &hsudc->gadget);
 	if (ret)
 		goto err_add_udc;
@@ -1359,7 +1351,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
 	return 0;
 err_add_udc:
-	device_unregister(&hsudc->gadget.dev);
 err_add_device:
 	clk_disable(hsudc->uclk);
 err_res: