From 13932bcdd6776f550afd1f9dac4eabf4ade0389c Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 24 Nov 2008 12:01:17 -0800
Subject: [PATCH] --- yaml --- r: 127257 b: refs/heads/master c:
 68144e0cc92125f41157ede7b060f83367bc4fe7 h: refs/heads/master i:   127255:
 5dfa30c401b0f856016afa8dba2136166d3351f3 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/plat-omap/usb.c      | 6 ++++++
 trunk/drivers/usb/gadget/omap_udc.c | 4 ++--
 trunk/include/linux/usb/otg.h       | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fbf5b3ab4683..a7ef48b49c99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6084f1bf0c51a99cbba612ee90a4607cffb8b042
+refs/heads/master: 68144e0cc92125f41157ede7b060f83367bc4fe7
diff --git a/trunk/arch/arm/plat-omap/usb.c b/trunk/arch/arm/plat-omap/usb.c
index 67ca1e216df7..2f88ca8b8f38 100644
--- a/trunk/arch/arm/plat-omap/usb.c
+++ b/trunk/arch/arm/plat-omap/usb.c
@@ -96,6 +96,12 @@ struct otg_transceiver *otg_get_transceiver(void)
 }
 EXPORT_SYMBOL(otg_get_transceiver);
 
+void otg_put_transceiver(struct otg_transceiver *x)
+{
+	put_device(x->dev);
+}
+EXPORT_SYMBOL(otg_put_transceiver);
+
 int otg_set_transceiver(struct otg_transceiver *x)
 {
 	if (xceiv && x)
diff --git a/trunk/drivers/usb/gadget/omap_udc.c b/trunk/drivers/usb/gadget/omap_udc.c
index 34e9e393f929..57d9641c6bf8 100644
--- a/trunk/drivers/usb/gadget/omap_udc.c
+++ b/trunk/drivers/usb/gadget/omap_udc.c
@@ -3006,7 +3006,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
 
 cleanup0:
 	if (xceiv)
-		put_device(xceiv->dev);
+		otg_put_transceiver(xceiv);
 
 	if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
 		clk_disable(hhc_clk);
@@ -3034,7 +3034,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
 
 	pullup_disable(udc);
 	if (udc->transceiver) {
-		put_device(udc->transceiver->dev);
+		otg_put_transceiver(udc->transceiver);
 		udc->transceiver = NULL;
 	}
 	omap_writew(0, UDC_SYSCON1);
diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h
index 1db25d152ad8..94df4fe6c6c0 100644
--- a/trunk/include/linux/usb/otg.h
+++ b/trunk/include/linux/usb/otg.h
@@ -84,6 +84,7 @@ extern int otg_set_transceiver(struct otg_transceiver *);
 
 /* for usb host and peripheral controller drivers */
 extern struct otg_transceiver *otg_get_transceiver(void);
+extern void otg_put_transceiver(struct otg_transceiver *);
 
 static inline int
 otg_start_hnp(struct otg_transceiver *otg)