diff options
| -rw-r--r-- | drivers/acpi/ac.c | 6 | ||||
| -rw-r--r-- | drivers/acpi/battery.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 4537ae4838c4..69a98da13913 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
| @@ -194,6 +194,8 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) | |||
| 194 | device = ac->device; | 194 | device = ac->device; |
| 195 | switch (event) { | 195 | switch (event) { |
| 196 | case ACPI_AC_NOTIFY_STATUS: | 196 | case ACPI_AC_NOTIFY_STATUS: |
| 197 | case ACPI_NOTIFY_BUS_CHECK: | ||
| 198 | case ACPI_NOTIFY_DEVICE_CHECK: | ||
| 197 | acpi_ac_get_state(ac); | 199 | acpi_ac_get_state(ac); |
| 198 | acpi_bus_generate_event(device, event, (u32) ac->state); | 200 | acpi_bus_generate_event(device, event, (u32) ac->state); |
| 199 | break; | 201 | break; |
| @@ -235,7 +237,7 @@ static int acpi_ac_add(struct acpi_device *device) | |||
| 235 | goto end; | 237 | goto end; |
| 236 | 238 | ||
| 237 | status = acpi_install_notify_handler(device->handle, | 239 | status = acpi_install_notify_handler(device->handle, |
| 238 | ACPI_DEVICE_NOTIFY, acpi_ac_notify, | 240 | ACPI_ALL_NOTIFY, acpi_ac_notify, |
| 239 | ac); | 241 | ac); |
| 240 | if (ACPI_FAILURE(status)) { | 242 | if (ACPI_FAILURE(status)) { |
| 241 | result = -ENODEV; | 243 | result = -ENODEV; |
| @@ -267,7 +269,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type) | |||
| 267 | ac = (struct acpi_ac *)acpi_driver_data(device); | 269 | ac = (struct acpi_ac *)acpi_driver_data(device); |
| 268 | 270 | ||
| 269 | status = acpi_remove_notify_handler(device->handle, | 271 | status = acpi_remove_notify_handler(device->handle, |
| 270 | ACPI_DEVICE_NOTIFY, acpi_ac_notify); | 272 | ACPI_ALL_NOTIFY, acpi_ac_notify); |
| 271 | 273 | ||
| 272 | acpi_ac_remove_fs(device); | 274 | acpi_ac_remove_fs(device); |
| 273 | 275 | ||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 2b8aab560b58..a192d2b47cc8 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -665,6 +665,8 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) | |||
| 665 | switch (event) { | 665 | switch (event) { |
| 666 | case ACPI_BATTERY_NOTIFY_STATUS: | 666 | case ACPI_BATTERY_NOTIFY_STATUS: |
| 667 | case ACPI_BATTERY_NOTIFY_INFO: | 667 | case ACPI_BATTERY_NOTIFY_INFO: |
| 668 | case ACPI_NOTIFY_BUS_CHECK: | ||
| 669 | case ACPI_NOTIFY_DEVICE_CHECK: | ||
| 668 | acpi_battery_check(battery); | 670 | acpi_battery_check(battery); |
| 669 | acpi_bus_generate_event(device, event, battery->flags.present); | 671 | acpi_bus_generate_event(device, event, battery->flags.present); |
| 670 | break; | 672 | break; |
| @@ -706,7 +708,7 @@ static int acpi_battery_add(struct acpi_device *device) | |||
| 706 | goto end; | 708 | goto end; |
| 707 | 709 | ||
| 708 | status = acpi_install_notify_handler(device->handle, | 710 | status = acpi_install_notify_handler(device->handle, |
| 709 | ACPI_DEVICE_NOTIFY, | 711 | ACPI_ALL_NOTIFY, |
| 710 | acpi_battery_notify, battery); | 712 | acpi_battery_notify, battery); |
| 711 | if (ACPI_FAILURE(status)) { | 713 | if (ACPI_FAILURE(status)) { |
| 712 | result = -ENODEV; | 714 | result = -ENODEV; |
| @@ -738,7 +740,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) | |||
| 738 | battery = (struct acpi_battery *)acpi_driver_data(device); | 740 | battery = (struct acpi_battery *)acpi_driver_data(device); |
| 739 | 741 | ||
| 740 | status = acpi_remove_notify_handler(device->handle, | 742 | status = acpi_remove_notify_handler(device->handle, |
| 741 | ACPI_DEVICE_NOTIFY, | 743 | ACPI_ALL_NOTIFY, |
| 742 | acpi_battery_notify); | 744 | acpi_battery_notify); |
| 743 | 745 | ||
| 744 | acpi_battery_remove_fs(device); | 746 | acpi_battery_remove_fs(device); |
