Commit 1dd5c715 authored by Lan Tianyu's avatar Lan Tianyu Committed by Len Brown
Browse files

ACPI / SBS: Add getting state operation in the acpi_sbs_battery_get_property() 

https://bugzilla.kernel.org/show_bug.cgi?id=24492



Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b4a03b9a

drivers/acpi/sbs.c

+5 −2
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ struct acpi_sbs { 


#define to_acpi_sbs(x) container_of(x, struct acpi_sbs, charger)



static int acpi_sbs_remove(struct acpi_device *device, int type);

static int acpi_battery_get_state(struct acpi_battery *battery);



static inline int battery_scale(int log)

{

	int scale = 1;
@@ -195,6 +198,8 @@ static int acpi_sbs_battery_get_property(struct power_supply *psy, 


	if ((!battery->present) && psp != POWER_SUPPLY_PROP_PRESENT)

		return -ENODEV;



	acpi_battery_get_state(battery);

	switch (psp) {

	case POWER_SUPPLY_PROP_STATUS:

		if (battery->rate_now < 0)
@@ -903,8 +908,6 @@ static void acpi_sbs_callback(void *context) 
	}

}



static int acpi_sbs_remove(struct acpi_device *device, int type);



static int acpi_sbs_add(struct acpi_device *device)

{

	struct acpi_sbs *sbs;