Merge 20041 from trunk
Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h

Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
--- branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci.c	2005-12-12 02:05:54 UTC (rev 20098)
+++ branches/ros-branch-0_2_9/reactos/drivers/usb/miniport/usbohci/ohci-pci.c	2005-12-12 04:50:06 UTC (rev 20099)
@@ -312,7 +312,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-static const struct hc_driver ohci_pci_hc_driver = {
+static struct hc_driver ohci_pci_hc_driver = {
 	.description =		hcd_name,
 
 	/*

Modified: branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h
--- branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h	2005-12-12 02:05:54 UTC (rev 20098)
+++ branches/ros-branch-0_2_9/reactos/drivers/usb/usbport/hcd.h	2005-12-12 04:50:06 UTC (rev 20099)
@@ -458,7 +458,10 @@
 	if (dev->parent)
 	{
 		PDEVICE_OBJECT Pdo = (PDEVICE_OBJECT)dev->parent->dev.dev_ext;
-		IoInvalidateDeviceRelations(Pdo, BusRelations);
+		if (Pdo)
+			IoInvalidateDeviceRelations(Pdo, BusRelations);
+		else
+			DPRINT1("Pdo == NULL, not sending IoInvalidateDeviceRelations()!");
 	}
 }
 static inline void usbfs_remove_device(struct usb_device *dev) {}