From 66809a7058019952a98bb5e911e8386deb74f18c Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Fri, 16 Mar 2012 12:58:20 -0700
Subject: [PATCH] --- yaml --- r: 299150 b: refs/heads/master c:
 5af98bb06dee79d28c805f9fd0805ce791121784 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/usb/host/xhci.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dbf865c2efce..96c1b654f3d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e833c0b87a30798e67f06120cecebef6ee9644c
+refs/heads/master: 5af98bb06dee79d28c805f9fd0805ce791121784
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index e1963d4a430f..f68bc15d21e8 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -106,6 +106,9 @@ int xhci_halt(struct xhci_hcd *xhci)
 			STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC);
 	if (!ret)
 		xhci->xhc_state |= XHCI_STATE_HALTED;
+	else
+		xhci_warn(xhci, "Host not halted after %u microseconds.\n",
+				XHCI_MAX_HALT_USEC);
 	return ret;
 }