From 829f21907d3b02c044a23f6d70969c07e6be5c49 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Thu, 7 Jun 2012 11:10:32 -0700
Subject: [PATCH] --- yaml --- r: 310910 b: refs/heads/master c:
 e25e62aecac42379e113c63a674a86ae3ebbec8d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 69599708d945..c0713079dfc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55558c33d6d46cb6f426b729f4119e3b2f12f02b
+refs/heads/master: e25e62aecac42379e113c63a674a86ae3ebbec8d
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index afdc73ee84a6..1d4958f7f007 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -3906,7 +3906,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
 	default:
 		dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n",
 				__func__);
-		return -EINVAL;
+		return USB3_LPM_DISABLED;
 	}
 
 	if (sel <= max_sel_pel && pel <= max_sel_pel)