From 087d618e78c3dd462b6697fb29a10e5ed8cd2f5b Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 24 Jan 2013 14:52:24 +0200
Subject: [PATCH] --- yaml --- r: 364535 b: refs/heads/master c:
 f07bd56bbdaa2340ebf46af9a37e7b2d1b4578e3 h: refs/heads/master i:   364533:
 365475196b391adf16a9859ae44ef8f3fe4d14b2   364531:
 05210c078984f656113d242a5ace81a27957c298   364527:
 a6094343b1f83b0f1f411dfc7dbac751d3ce5223 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/usb/gadget/udc-core.c | 23 +++++++++++++++++++----
 trunk/include/linux/usb/gadget.h    |  4 ++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0e39ef89fdcd..4726753bac16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eaf8f2a7da6506df0e6edc4fdb22678f0eb3602
+refs/heads/master: f07bd56bbdaa2340ebf46af9a37e7b2d1b4578e3
diff --git a/trunk/drivers/usb/gadget/udc-core.c b/trunk/drivers/usb/gadget/udc-core.c
index 2a9cd369f71c..919505426ec1 100644
--- a/trunk/drivers/usb/gadget/udc-core.c
+++ b/trunk/drivers/usb/gadget/udc-core.c
@@ -173,6 +173,14 @@ int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget)
 	if (!udc)
 		goto err1;
 
+	if (gadget->register_my_device) {
+		dev_set_name(&gadget->dev, "gadget");
+
+		ret = device_register(&gadget->dev);
+		if (ret)
+			goto err2;
+	}
+
 	device_initialize(&udc->dev);
 	udc->dev.release = usb_udc_release;
 	udc->dev.class = udc_class;
@@ -180,7 +188,7 @@ int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget)
 	udc->dev.parent = parent;
 	ret = dev_set_name(&udc->dev, "%s", kobject_name(&parent->kobj));
 	if (ret)
-		goto err2;
+		goto err3;
 
 	udc->gadget = gadget;
 
@@ -189,18 +197,22 @@ int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget)
 
 	ret = device_add(&udc->dev);
 	if (ret)
-		goto err3;
+		goto err4;
 
 	mutex_unlock(&udc_lock);
 
 	return 0;
-err3:
+
+err4:
 	list_del(&udc->list);
 	mutex_unlock(&udc_lock);
 
-err2:
+err3:
 	put_device(&udc->dev);
 
+err2:
+	if (gadget->register_my_device)
+		put_device(&gadget->dev);
 err1:
 	return ret;
 }
@@ -254,6 +266,9 @@ void usb_del_gadget_udc(struct usb_gadget *gadget)
 
 	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
 	device_unregister(&udc->dev);
+
+	if (gadget->register_my_device)
+		device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
 
diff --git a/trunk/include/linux/usb/gadget.h b/trunk/include/linux/usb/gadget.h
index 2e297e80d59a..fcd9ef8d3f70 100644
--- a/trunk/include/linux/usb/gadget.h
+++ b/trunk/include/linux/usb/gadget.h
@@ -494,6 +494,9 @@ struct usb_gadget_ops {
  *	only supports HNP on a different root port.
  * @b_hnp_enable: OTG device feature flag, indicating that the A-Host
  *	enabled HNP support.
+ * @register_my_device: Flag telling udc-core that UDC driver didn't
+ *	register the gadget device to the driver model. Temporary until
+ *	all UDC drivers are fixed up properly.
  * @name: Identifies the controller hardware type.  Used in diagnostics
  *	and sometimes configuration.
  * @dev: Driver model state for this abstract device.
@@ -531,6 +534,7 @@ struct usb_gadget {
 	unsigned			b_hnp_enable:1;
 	unsigned			a_hnp_support:1;
 	unsigned			a_alt_hnp_support:1;
+	unsigned			register_my_device:1;
 	const char			*name;
 	struct device			dev;
 	unsigned			out_epnum;