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

Commit 27568d8e authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-16244' into release

parents 855977ef 153e500f

drivers/acpi/battery.c

+7 −1
Original line number Diff line number Diff line
@@ -868,9 +868,15 @@ static void acpi_battery_remove_fs(struct acpi_device *device) 
static void acpi_battery_notify(struct acpi_device *device, u32 event)

{

	struct acpi_battery *battery = acpi_driver_data(device);

#ifdef CONFIG_ACPI_SYSFS_POWER

	struct device *old;

#endif



	if (!battery)

		return;

#ifdef CONFIG_ACPI_SYSFS_POWER

	old = battery->bat.dev;

#endif

	acpi_battery_update(battery);

	acpi_bus_generate_proc_event(device, event,

				     acpi_battery_present(battery));
@@ -879,7 +885,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) 
					acpi_battery_present(battery));

#ifdef CONFIG_ACPI_SYSFS_POWER

	/* acpi_battery_update could remove power_supply object */

	if (battery->bat.dev)

	if (old && battery->bat.dev)

		power_supply_changed(&battery->bat);

#endif

}