[ACPI]

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

diff --git a/reactos/drivers/bus/acpi/busmgr/bus.c b/reactos/drivers/bus/acpi/busmgr/bus.c
index 2706dd3..2130f3c 100644 (file)
--- a/reactos/drivers/bus/acpi/busmgr/bus.c
+++ b/reactos/drivers/bus/acpi/busmgr/bus.c
@@ -721,11 +721,13 @@ acpi_bus_notify (
        //blocking_notifier_call_chain(&acpi_bus_notify_list,
        //      type, (void *)handle);
 
+       acpi_bus_get_device(handle, &device);
+
        switch (type) {
 
        case ACPI_NOTIFY_BUS_CHECK:
                DPRINT("Received BUS CHECK notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                acpi_bus_check_scope(handle);
                /*
                 * TBD: We'll need to outsource certain events to non-ACPI
@@ -735,7 +737,7 @@ acpi_bus_notify (
 
        case ACPI_NOTIFY_DEVICE_CHECK:
                DPRINT("Received DEVICE CHECK notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                acpi_bus_check_device(handle);
                /*
                 * TBD: We'll need to outsource certain events to non-ACPI
@@ -745,7 +747,7 @@ acpi_bus_notify (
 
        case ACPI_NOTIFY_DEVICE_WAKE:
                DPRINT("Received DEVICE WAKE notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                acpi_bus_check_device(handle);
                /*
                 * TBD: We'll need to outsource certain events to non-ACPI
@@ -755,41 +757,40 @@ acpi_bus_notify (
 
        case ACPI_NOTIFY_EJECT_REQUEST:
                DPRINT1("Received EJECT REQUEST notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                /* TBD */
                break;
 
        case ACPI_NOTIFY_DEVICE_CHECK_LIGHT:
                DPRINT1("Received DEVICE CHECK LIGHT notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                /* TBD: Exactly what does 'light' mean? */
                break;
 
        case ACPI_NOTIFY_FREQUENCY_MISMATCH:
                DPRINT1("Received FREQUENCY MISMATCH notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                /* TBD */
                break;
 
        case ACPI_NOTIFY_BUS_MODE_MISMATCH:
                DPRINT1("Received BUS MODE MISMATCH notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                /* TBD */
                break;
 
        case ACPI_NOTIFY_POWER_FAULT:
                DPRINT1("Received POWER FAULT notification for device [%s]\n",
-                       device->pnp.bus_id);
+                       device ? device->pnp.bus_id : "n/a");
                /* TBD */
                break;
 
        default:
-               DPRINT1("Received unknown/unsupported notification [%08x]\n",
-                       type);
+               DPRINT1("Received unknown/unsupported notification [%08x] for device [%s]\n",
+                       type, device ? device->pnp.bus_id : "n/a");
                break;
        }
 
-       acpi_bus_get_device(handle, &device);
        if (device) {
                driver = device->driver;
                if (driver && driver->ops.notify &&
@@ -1191,13 +1192,13 @@ acpi_bus_add (
                snprintf(device->pnp.bus_id, sizeof(device->pnp.bus_id), "%s", bus_id);
                buffer.Pointer = NULL;
 
-        /* HACK: Skip HPET */
-        if (strstr(device->pnp.bus_id, "HPET"))
-        {
-            DPRINT("Using HPET hack\n");
-            result = -1;
-            goto end;
-        }
+               /* HACK: Skip HPET */
+               if (strstr(device->pnp.bus_id, "HPET"))
+               {
+                       DPRINT("Using HPET hack\n");
+                       result = -1;
+                       goto end;
+               }
 
                break;
        }
@@ -1273,6 +1274,7 @@ acpi_bus_add (
                        device->pnp.bus_address = info->Address;
                        device->flags.bus_address = 1;
                }
+               ACPI_FREE(info);
                break;
        case ACPI_BUS_TYPE_POWER:
                hid = ACPI_POWER_HID;
@@ -1672,7 +1674,7 @@ acpi_bus_init (void)
        /*
         * Register the for all standard device notifications.
         */
-       status = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &acpi_bus_notify, NULL);
+       status = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, acpi_bus_notify, NULL);
        if (ACPI_FAILURE(status)) {
                DPRINT1("Unable to register for device notifications\n");
                result = AE_NOT_FOUND;
@@ -1703,7 +1705,7 @@ acpi_bus_init (void)
        /* Mimic structured exception handling */
 error2:
        AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT,
-               ACPI_SYSTEM_NOTIFY, &acpi_bus_notify);
+               ACPI_SYSTEM_NOTIFY, acpi_bus_notify);
 error1:
        AcpiTerminate();
        return_VALUE(AE_NOT_FOUND);
@@ -1752,7 +1754,7 @@ acpi_init (void)
 
        DPRINT("Subsystem revision %08x\n",ACPI_CA_VERSION);
 
-        KeInitializeSpinLock(&acpi_bus_event_lock);
+       KeInitializeSpinLock(&acpi_bus_event_lock);
        KeInitializeEvent(&AcpiEventQueue, NotificationEvent, FALSE);
        ExInitializeFastMutex(&acpi_bus_drivers_lock);