From d8d06f09031aec1048597ebee71ea545d0591892 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 20 Jan 2012 23:19:18 +0000
Subject: [PATCH] [USB-BRINGUP-TRUNK] - Fix usbohci build

svn path=/branches/usb-bringup-trunk/; revision=55032
---
 drivers/usb/usbohci/CMakeLists.txt |  1 -
 drivers/usb/usbohci/hardware.cpp   |  3 +--
 drivers/usb/usbohci/usb_device.cpp |  1 -
 drivers/usb/usbohci/usb_queue.cpp  | 10 ++++++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/usbohci/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt
index d7f16ab1707..de3deca69d8 100644
--- a/drivers/usb/usbohci/CMakeLists.txt
+++ b/drivers/usb/usbohci/CMakeLists.txt
@@ -19,7 +19,6 @@ add_library(usbohci SHARED
 
 target_link_libraries(usbohci
     libcntpr
-    stlport
     ${PSEH_LIB})
 
 if(MSVC)
diff --git a/drivers/usb/usbohci/hardware.cpp b/drivers/usb/usbohci/hardware.cpp
index 4e68d666997..52044d30984 100644
--- a/drivers/usb/usbohci/hardware.cpp
+++ b/drivers/usb/usbohci/hardware.cpp
@@ -997,7 +997,7 @@ CUSBHardwareDevice::ClearPortStatus(
     ULONG PortId,
     ULONG Status)
 {
-    ULONG Value, Index = 0;
+    ULONG Value;
 
     DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status);
 
@@ -1383,7 +1383,6 @@ OhciDefferedRoutine(
 {
     CUSBHardwareDevice *This;
     ULONG CStatus, Index, PortStatus;
-    POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor;
     ULONG DoneHead;
 
     //
diff --git a/drivers/usb/usbohci/usb_device.cpp b/drivers/usb/usbohci/usb_device.cpp
index ea148137aa5..67936699cc0 100644
--- a/drivers/usb/usbohci/usb_device.cpp
+++ b/drivers/usb/usbohci/usb_device.cpp
@@ -1028,7 +1028,6 @@ CUSBDevice::SelectInterface(
     IN USBD_CONFIGURATION_HANDLE ConfigurationHandle,
     IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo)
 {
-    ULONG ConfigurationIndex = 0;
     PUSB_CONFIGURATION_DESCRIPTOR Configuration;
     ULONG PipeIndex;
     USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup;
diff --git a/drivers/usb/usbohci/usb_queue.cpp b/drivers/usb/usbohci/usb_queue.cpp
index f3f993e7bee..5d0fa1491d4 100644
--- a/drivers/usb/usbohci/usb_queue.cpp
+++ b/drivers/usb/usbohci/usb_queue.cpp
@@ -169,7 +169,6 @@ CUSBQueue::AddUSBRequest(
 {
     NTSTATUS Status;
     ULONG Type;
-    KIRQL OldLevel;
     POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor;
     POHCI_ENDPOINT_DESCRIPTOR Descriptor;
     POHCI_ISO_TD CurrentDescriptor;
@@ -289,6 +288,14 @@ CUSBQueue::AddUSBRequest(
 
         PrintEndpointList(m_IsoHeadEndpointDescriptor);
     }
+    else
+    {
+        //
+        // bad request type
+        //
+        Request->Release();
+        return STATUS_INVALID_PARAMETER;
+    }
 
     //
     // set descriptor active
@@ -308,7 +315,6 @@ CUSBQueue::AddUSBRequest(
         m_Hardware->HeadEndpointDescriptorModified(Type);
     }
 
-
     return STATUS_SUCCESS;
 }