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

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

Merge branch 'battery' into release

parents 39cecf20 50b17851

drivers/acpi/battery.c

+3 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery) 


static int acpi_battery_update(struct acpi_battery *battery)

{

	int result;

	int result, old_present = acpi_battery_present(battery);

	result = acpi_battery_get_status(battery);

	if (result)

		return result;
@@ -482,7 +482,8 @@ static int acpi_battery_update(struct acpi_battery *battery) 
		return 0;

	}

#endif

	if (!battery->update_time) {

	if (!battery->update_time ||

	    old_present != acpi_battery_present(battery)) {

		result = acpi_battery_get_info(battery);

		if (result)

			return result;