Sync with trunk r58740.

[reactos.git] / drivers / bus / acpi / pnp.c

diff --git a/drivers/bus/acpi/pnp.c b/drivers/bus/acpi/pnp.c
index 9259fb9..c935cd0 100644 (file)
--- a/drivers/bus/acpi/pnp.c
+++ b/drivers/bus/acpi/pnp.c
@@ -10,11 +10,16 @@
 #define NDEBUG
 #include <debug.h>
 
+NTSTATUS
+Bus_PlugInDevice (
+    struct acpi_device *Device,
+    PFDO_DEVICE_DATA            FdoData
+    );
+
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text (PAGE, Bus_PnP)
 #pragma alloc_text (PAGE, Bus_PlugInDevice)
 #pragma alloc_text (PAGE, Bus_InitializePdo)
-#pragma alloc_text (PAGE, Bus_UnPlugDevice)
 #pragma alloc_text (PAGE, Bus_DestroyPdo)
 #pragma alloc_text (PAGE, Bus_FDO_PnP)
 #pragma alloc_text (PAGE, Bus_StartFdo)
@@ -188,7 +193,7 @@ Bus_FDO_PnP (
         //
 
         length = sizeof(DEVICE_RELATIONS) +
-                ((numPdosPresent + prevcount) * sizeof (PDEVICE_OBJECT)) -1;
+                (((numPdosPresent + prevcount) - 1) * sizeof (PDEVICE_OBJECT));
 
         relations = (PDEVICE_RELATIONS) ExAllocatePoolWithTag (PagedPool,
                                         length, 'IPCA');
@@ -307,7 +312,7 @@ Bus_StartFdo (
     /* Initialize ACPI bus manager */
     AcpiStatus = acpi_init();
     if (!ACPI_SUCCESS(AcpiStatus)) {
-        DPRINT("acpi_init() failed with status 0x%X\n", AcpiStatus);
+        DPRINT1("acpi_init() failed with status 0x%X\n", AcpiStatus);
         AcpiTerminate();
         return STATUS_UNSUCCESSFUL;
     }
@@ -401,7 +406,7 @@ Bus_DestroyPdo (
     //
 
     if (PdoData->HardwareIDs) {
-        ExFreePool (PdoData->HardwareIDs);
+        ExFreePoolWithTag (PdoData->HardwareIDs, 'IPCA');
         PdoData->HardwareIDs = NULL;
     }