From 5805adfebb8967e5ad283c512554872876b0b43f Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Thu, 28 Apr 2011 12:23:23 -0700
Subject: [PATCH] --- yaml --- r: 248799 b: refs/heads/master c:
 00161f7d04eb1668fde5e22d3e5a17bf90356d2c h: refs/heads/master i:   248797:
 30da5c5f3b9c85ec8e53421e81eadc01a213dc69   248795:
 26c4bc56039d07b39c2fffd5db8cd1a660be95e5   248791:
 aee591be0c66ac04aab0aad4e9affcc67e525e37   248783:
 da3bc08c63d2324ce89ca263f7a493361c59642d   248767:
 f56637844c6b60a369881017f07d879b3afebc4a v: v3

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

diff --git a/[refs] b/[refs]
index 41198d5dec6f..fef5faa084dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e467f6ebab151b2f0166e17348e5b85ae3c87fa
+refs/heads/master: 00161f7d04eb1668fde5e22d3e5a17bf90356d2c
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index 5c0ae90df31e..6864759c8d1a 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -1502,7 +1502,7 @@ static void xhci_zero_in_ctx(struct xhci_hcd *xhci, struct xhci_virt_device *vir
 }
 
 static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
-		struct usb_device *udev, int *cmd_status)
+		struct usb_device *udev, u32 *cmd_status)
 {
 	int ret;
 
@@ -1540,7 +1540,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
 }
 
 static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
-		struct usb_device *udev, int *cmd_status)
+		struct usb_device *udev, u32 *cmd_status)
 {
 	int ret;
 	struct xhci_virt_device *virt_dev = xhci->devs[udev->slot_id];