From 65334af69ee7662da50e24d28df025a9e6fe6b47 Mon Sep 17 00:00:00 2001
From: Juha Yrj?l? <juha.yrjola@nokia.com>
Date: Sun, 16 Oct 2005 15:47:04 -0700
Subject: [PATCH] --- yaml --- r: 10799 b: refs/heads/master c:
 4e67185a7ac3ecb1710e636e2f7e318e99298c7a h: refs/heads/master i:   10797:
 f32a2a841bacdd4c030eef4fec96fc1b0169e7f8   10795:
 f2b0aef2bb2d48c70a534aa4bf85e0a06e89bfc0   10791:
 93843de2b25b4afe9388e390d2780ab65fc9a95d   10783:
 ffc12a2a0ff8962c080a3e679ab779727e19ff30 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/usb/gadget/omap_udc.c |  4 ++++
 trunk/include/linux/usb_otg.h       | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 37c71814ec93..597a6a990159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f37be9b9be3ebc02d2d075d7f53f7802f3e005db
+refs/heads/master: 4e67185a7ac3ecb1710e636e2f7e318e99298c7a
diff --git a/trunk/drivers/usb/gadget/omap_udc.c b/trunk/drivers/usb/gadget/omap_udc.c
index de8a89ae4bc3..b42799bc747a 100644
--- a/trunk/drivers/usb/gadget/omap_udc.c
+++ b/trunk/drivers/usb/gadget/omap_udc.c
@@ -1788,8 +1788,12 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
 					udc->driver->suspend(&udc->gadget);
 					spin_lock(&udc->lock);
 				}
+				if (udc->transceiver)
+					otg_set_suspend(udc->transceiver, 1);
 			} else {
 				VDBG("resume\n");
+				if (udc->transceiver)
+					otg_set_suspend(udc->transceiver, 0);
 				if (udc->gadget.speed == USB_SPEED_FULL
 						&& udc->driver->resume) {
 					spin_unlock(&udc->lock);
diff --git a/trunk/include/linux/usb_otg.h b/trunk/include/linux/usb_otg.h
index c6683146e9b0..f827f6e203c2 100644
--- a/trunk/include/linux/usb_otg.h
+++ b/trunk/include/linux/usb_otg.h
@@ -63,6 +63,10 @@ struct otg_transceiver {
 	int	(*set_power)(struct otg_transceiver *otg,
 				unsigned mA);
 
+	/* for non-OTG B devices: set transceiver into suspend mode */
+	int	(*set_suspend)(struct otg_transceiver *otg,
+				int suspend);
+
 	/* for B devices only:  start session with A-Host */
 	int	(*start_srp)(struct otg_transceiver *otg);
 
@@ -107,6 +111,15 @@ otg_set_power(struct otg_transceiver *otg, unsigned mA)
 	return otg->set_power(otg, mA);
 }
 
+static inline int
+otg_set_suspend(struct otg_transceiver *otg, int suspend)
+{
+	if (otg->set_suspend != NULL)
+		return otg->set_suspend(otg, suspend);
+	else
+		return 0;
+}
+
 static inline int
 otg_start_srp(struct otg_transceiver *otg)
 {