Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e5f39f authored by Len Brown's avatar Len Brown
Browse files

Pull bugzilla-3241 into release branch

parents 361ea93c 9fdae727

drivers/acpi/ac.c

+4 −2
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
	device = ac->device;

	switch (event) {

	case ACPI_AC_NOTIFY_STATUS:

	case ACPI_NOTIFY_BUS_CHECK:

	case ACPI_NOTIFY_DEVICE_CHECK:

		acpi_ac_get_state(ac);

		acpi_bus_generate_event(device, event, (u32) ac->state);

		break;
@@ -235,7 +237,7 @@ static int acpi_ac_add(struct acpi_device *device) 
		goto end;



	status = acpi_install_notify_handler(device->handle,

					     ACPI_DEVICE_NOTIFY, acpi_ac_notify,

					     ACPI_ALL_NOTIFY, acpi_ac_notify,

					     ac);

	if (ACPI_FAILURE(status)) {

		result = -ENODEV;
@@ -267,7 +269,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type) 
	ac = (struct acpi_ac *)acpi_driver_data(device);



	status = acpi_remove_notify_handler(device->handle,

					    ACPI_DEVICE_NOTIFY, acpi_ac_notify);

					    ACPI_ALL_NOTIFY, acpi_ac_notify);



	acpi_ac_remove_fs(device);

drivers/acpi/battery.c

+4 −2
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
	switch (event) {

	case ACPI_BATTERY_NOTIFY_STATUS:

	case ACPI_BATTERY_NOTIFY_INFO:

	case ACPI_NOTIFY_BUS_CHECK:

	case ACPI_NOTIFY_DEVICE_CHECK:

		acpi_battery_check(battery);

		acpi_bus_generate_event(device, event, battery->flags.present);

		break;
@@ -706,7 +708,7 @@ static int acpi_battery_add(struct acpi_device *device) 
		goto end;



	status = acpi_install_notify_handler(device->handle,

					     ACPI_DEVICE_NOTIFY,

					     ACPI_ALL_NOTIFY,

					     acpi_battery_notify, battery);

	if (ACPI_FAILURE(status)) {

		result = -ENODEV;
@@ -738,7 +740,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
	battery = (struct acpi_battery *)acpi_driver_data(device);



	status = acpi_remove_notify_handler(device->handle,

					    ACPI_DEVICE_NOTIFY,

					    ACPI_ALL_NOTIFY,

					    acpi_battery_notify);



	acpi_battery_remove_fs(device);