|
@@ -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)
|
|
static void acpi_battery_notify(struct acpi_device *device, u32 event)
|
|
{
|
|
{
|
|
struct acpi_battery *battery = acpi_driver_data(device);
|
|
struct acpi_battery *battery = acpi_driver_data(device);
|
|
|
|
+#ifdef CONFIG_ACPI_SYSFS_POWER
|
|
|
|
+ struct device *old;
|
|
|
|
+#endif
|
|
|
|
|
|
if (!battery)
|
|
if (!battery)
|
|
return;
|
|
return;
|
|
|
|
+#ifdef CONFIG_ACPI_SYSFS_POWER
|
|
|
|
+ old = battery->bat.dev;
|
|
|
|
+#endif
|
|
acpi_battery_update(battery);
|
|
acpi_battery_update(battery);
|
|
acpi_bus_generate_proc_event(device, event,
|
|
acpi_bus_generate_proc_event(device, event,
|
|
acpi_battery_present(battery));
|
|
acpi_battery_present(battery));
|
|
@@ -879,7 +885,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
|
|
acpi_battery_present(battery));
|
|
acpi_battery_present(battery));
|
|
#ifdef CONFIG_ACPI_SYSFS_POWER
|
|
#ifdef CONFIG_ACPI_SYSFS_POWER
|
|
/* acpi_battery_update could remove power_supply object */
|
|
/* acpi_battery_update could remove power_supply object */
|
|
- if (battery->bat.dev)
|
|
|
|
|
|
+ if (old && battery->bat.dev)
|
|
power_supply_changed(&battery->bat);
|
|
power_supply_changed(&battery->bat);
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|