Fix for bug #932 (should go into 0.2.9 also)

svn path=/trunk/; revision=20041

diff --git a/reactos/drivers/usb/miniport/usbohci/ohci-pci.c b/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
index 95ca524..2ba3d7d 100644 (file)
--- a/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
+++ b/reactos/drivers/usb/miniport/usbohci/ohci-pci.c
@@ -312,7 +312,7 @@ ohci_dbg (ohci, "sleeping = %d, disabled = %d\n",
 
 /*-------------------------------------------------------------------------*/
 
-static const struct hc_driver ohci_pci_hc_driver = {
+static struct hc_driver ohci_pci_hc_driver = {
        .description =          hcd_name,
 
        /*

diff --git a/reactos/drivers/usb/usbport/hcd.h b/reactos/drivers/usb/usbport/hcd.h
index ac564c6..593ef5d 100644 (file)
--- a/reactos/drivers/usb/usbport/hcd.h
+++ b/reactos/drivers/usb/usbport/hcd.h
@@ -458,7 +458,10 @@ static inline void usbfs_add_device(struct usb_device *dev)
        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) {}