From: Tony Lindgren <tony@atomide.com>
Date: Tue, 9 Oct 2007 23:26:59 +0000 (-0700)
Subject: musb_hdrc: Allow suspend if host is already suspended
X-Git-Tag: v2.6.23-omap1~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=318068ca7104295d6177637521c5ec6cf8cb88b1;p=linux-2.6-omap-h63xx.git

musb_hdrc: Allow suspend if host is already suspended

Allow suspend if host is already suspended

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 091ae8f548a..4eeff91b926 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2128,6 +2128,9 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
 {
 	struct musb	*musb = hcd_to_musb(hcd);
 
+	if (musb->xceiv.state == OTG_STATE_A_SUSPEND)
+		return 0;
+
 	if (is_host_active(musb) && musb->is_active) {
 		WARN("trying to suspend as %s is_active=%i\n",
 			otg_state_string(musb), musb->is_active);