diff options
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0c93cd400ddb..dd49ea0d0ed3 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -147,7 +147,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state) | |||
147 | *state = ACPI_STATE_D0; | 147 | *state = ACPI_STATE_D0; |
148 | } else { | 148 | } else { |
149 | /* | 149 | /* |
150 | * Get the device's power state either directly (via _PSC) or | 150 | * Get the device's power state either directly (via _PSC) or |
151 | * indirectly (via power resources). | 151 | * indirectly (via power resources). |
152 | */ | 152 | */ |
153 | if (device->power.flags.explicit_get) { | 153 | if (device->power.flags.explicit_get) { |
@@ -461,7 +461,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) | |||
461 | "Received BUS CHECK notification for device [%s]\n", | 461 | "Received BUS CHECK notification for device [%s]\n", |
462 | device->pnp.bus_id)); | 462 | device->pnp.bus_id)); |
463 | result = acpi_bus_check_scope(device); | 463 | result = acpi_bus_check_scope(device); |
464 | /* | 464 | /* |
465 | * TBD: We'll need to outsource certain events to non-ACPI | 465 | * TBD: We'll need to outsource certain events to non-ACPI |
466 | * drivers via the device manager (device.c). | 466 | * drivers via the device manager (device.c). |
467 | */ | 467 | */ |
@@ -472,7 +472,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) | |||
472 | "Received DEVICE CHECK notification for device [%s]\n", | 472 | "Received DEVICE CHECK notification for device [%s]\n", |
473 | device->pnp.bus_id)); | 473 | device->pnp.bus_id)); |
474 | result = acpi_bus_check_device(device, NULL); | 474 | result = acpi_bus_check_device(device, NULL); |
475 | /* | 475 | /* |
476 | * TBD: We'll need to outsource certain events to non-ACPI | 476 | * TBD: We'll need to outsource certain events to non-ACPI |
477 | * drivers via the device manager (device.c). | 477 | * drivers via the device manager (device.c). |
478 | */ | 478 | */ |
@@ -542,7 +542,7 @@ static int __init acpi_bus_init_irq(void) | |||
542 | char *message = NULL; | 542 | char *message = NULL; |
543 | 543 | ||
544 | 544 | ||
545 | /* | 545 | /* |
546 | * Let the system know what interrupt model we are using by | 546 | * Let the system know what interrupt model we are using by |
547 | * evaluating the \_PIC object, if exists. | 547 | * evaluating the \_PIC object, if exists. |
548 | */ | 548 | */ |
@@ -683,7 +683,7 @@ static int __init acpi_bus_init(void) | |||
683 | * the EC device is found in the namespace (i.e. before acpi_initialize_objects() | 683 | * the EC device is found in the namespace (i.e. before acpi_initialize_objects() |
684 | * is called). | 684 | * is called). |
685 | * | 685 | * |
686 | * This is accomplished by looking for the ECDT table, and getting | 686 | * This is accomplished by looking for the ECDT table, and getting |
687 | * the EC parameters out of that. | 687 | * the EC parameters out of that. |
688 | */ | 688 | */ |
689 | status = acpi_ec_ecdt_probe(); | 689 | status = acpi_ec_ecdt_probe(); |
@@ -698,6 +698,9 @@ static int __init acpi_bus_init(void) | |||
698 | 698 | ||
699 | printk(KERN_INFO PREFIX "Interpreter enabled\n"); | 699 | printk(KERN_INFO PREFIX "Interpreter enabled\n"); |
700 | 700 | ||
701 | /* Initialize sleep structures */ | ||
702 | acpi_sleep_init(); | ||
703 | |||
701 | /* | 704 | /* |
702 | * Get the system interrupt model and evaluate \_PIC. | 705 | * Get the system interrupt model and evaluate \_PIC. |
703 | */ | 706 | */ |