mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 00:50:54 +07:00
ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
Disabling CONFIG_ACPI_SYSFS_POWER changes the behaviour of acpi_battery_update(). It will call acpi_battery_get_info() even if the battery is not present. I haven't noticed this causing any problem, but it does look like a bad idea. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
2eaa9cfdf3
commit
e363a755e8
@ -567,13 +567,13 @@ static int acpi_battery_update(struct acpi_battery *battery)
|
|||||||
result = acpi_battery_get_status(battery);
|
result = acpi_battery_get_status(battery);
|
||||||
if (result)
|
if (result)
|
||||||
return result;
|
return result;
|
||||||
#ifdef CONFIG_ACPI_SYSFS_POWER
|
|
||||||
if (!acpi_battery_present(battery)) {
|
if (!acpi_battery_present(battery)) {
|
||||||
|
#ifdef CONFIG_ACPI_SYSFS_POWER
|
||||||
sysfs_remove_battery(battery);
|
sysfs_remove_battery(battery);
|
||||||
|
#endif
|
||||||
battery->update_time = 0;
|
battery->update_time = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
if (!battery->update_time ||
|
if (!battery->update_time ||
|
||||||
old_present != acpi_battery_present(battery)) {
|
old_present != acpi_battery_present(battery)) {
|
||||||
result = acpi_battery_get_info(battery);
|
result = acpi_battery_get_info(battery);
|
||||||
|
Loading…
Reference in New Issue
Block a user