---

yaml
---
r: 364495
b: refs/heads/master
c: adf0f73
h: refs/heads/master
i:
  364493: a866564
  364491: 6c2a94c
  364487: 4a51522
  364479: 9a6bb75
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e333a3b17050800a5aa536feb628f18d2a01a2
+refs/heads/master: adf0f735e61aae5ff615bb0301d9fff29b589a5c

trunk/drivers/usb/chipidea/core.c

@@ -455,8 +455,11 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 	if (ci->is_otg)
 		hw_write(ci, OP_OTGSC, OTGSC_IDIE, OTGSC_IDIE);
 
-	return ret;
+	ret = dbg_create_files(ci);
+	if (!ret)
+		return 0;
 
+	free_irq(ci->irq, ci);
 stop:
 	ci_role_stop(ci);
 rm_wq:
@@ -470,6 +473,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
 {
 	struct ci13xxx *ci = platform_get_drvdata(pdev);
 
+	dbg_remove_files(ci);
 	flush_workqueue(ci->wq);
 	destroy_workqueue(ci->wq);
 	free_irq(ci->irq, ci);

trunk/drivers/usb/chipidea/udc.c

@@ -1697,15 +1697,11 @@ static int udc_start(struct ci13xxx *ci)
 		goto put_transceiver;
 	}
 
-	retval = dbg_create_files(ci);
-	if (retval)
-		goto unreg_device;
-
 	if (!IS_ERR_OR_NULL(ci->transceiver)) {
 		retval = otg_set_peripheral(ci->transceiver->otg,
 						&ci->gadget);
 		if (retval)
-			goto remove_dbg;
+			goto unreg_device;
 	}
 
 	retval = usb_add_gadget_udc(dev, &ci->gadget);
@@ -1725,8 +1721,6 @@ static int udc_start(struct ci13xxx *ci)
 	}
 
 	dev_err(dev, "error = %i\n", retval);
-remove_dbg:
-	dbg_remove_files(ci);
 unreg_device:
 	device_unregister(&ci->gadget.dev);
 put_transceiver:
@@ -1763,7 +1757,6 @@ static void udc_stop(struct ci13xxx *ci)
 		if (ci->global_phy)
 			usb_put_phy(ci->transceiver);
 	}
-	dbg_remove_files(ci);
 	device_unregister(&ci->gadget.dev);
 	/* my kobject is dynamic, I swear! */
 	memset(&ci->gadget, 0, sizeof(ci->gadget));