[USB-BRINGUP-TRUNK]

- Fix a BSOD during usbstor device initialization
- Enable usbstor in 1st stage

svn path=/branches/usb-bringup-trunk/; revision=55036

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 4b7cf36..9d6bae1 100644 (file)
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -76,7 +76,7 @@ USB\ROOT_HUB20 = usbhub
 ;PCI\CC_0C0300 = usbuhci
 PCI\CC_0C0310 = usbohci
 PCI\CC_0C0320 = usbehci
-;USB\Class_08&SubClass_06&Prot_50 = usbstor
+USB\Class_08&SubClass_06&Prot_50 = usbstor
 HID_DEVICE_SYSTEM_KEYBOARD = kbdhid
 
 [BootBusExtenders.Load]

diff --git a/drivers/usb/usbstor/descriptor.c b/drivers/usb/usbstor/descriptor.c
index 070faba..28b7ead 100644 (file)
--- a/drivers/usb/usbstor/descriptor.c
+++ b/drivers/usb/usbstor/descriptor.c
@@ -411,7 +411,7 @@ USBSTOR_SelectConfigurationAndInterface(
         //
         DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n", Status);
         FreeItem(InterfaceList);
-        FreeItem(Urb);
+        ExFreePool(Urb);
         return Status;
     }
 
@@ -425,7 +425,7 @@ USBSTOR_SelectConfigurationAndInterface(
         // failed to allocate interface information structure
         //
         FreeItem(InterfaceList);
-        FreeItem(Urb);
+        ExFreePool(Urb);
         return Status;
     }
 
@@ -470,7 +470,7 @@ USBSTOR_SelectConfigurationAndInterface(
     // free interface list & urb
     //
     FreeItem(InterfaceList);
-    FreeItem(Urb);
+    ExFreePool(Urb);
 
     //
     // done