Author: cgutman
Date: Sat Jan 21 00:31:09 2012
New Revision: 55036
URL: http://svn.reactos.org/svn/reactos?rev=55036&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Fix a BSOD during usbstor device initialization
- Enable usbstor in 1st stage
Modified:
branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c
Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif?rev=55036&r1=55035&r2=55036&view=diff
==============================================================================
--- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Jan
21 00:31:09 2012
@@ -76,7 +76,7 @@
;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]
Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c?rev=55036&r1=55035&r2=55036&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1]
Sat Jan 21 00:31:09 2012
@@ -411,7 +411,7 @@
//
DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n",
Status);
FreeItem(InterfaceList);
- FreeItem(Urb);
+ ExFreePool(Urb);
return Status;
}
@@ -425,7 +425,7 @@
// failed to allocate interface information structure
//
FreeItem(InterfaceList);
- FreeItem(Urb);
+ ExFreePool(Urb);
return Status;
}
@@ -470,7 +470,7 @@
// free interface list & urb
//
FreeItem(InterfaceList);
- FreeItem(Urb);
+ ExFreePool(Urb);
//
// done
