Re: [2.6.24-rc1][BUG] Oops on battery removal

[Alexey Starikovskiy]

Rolf Eike Beer wrote:
> Alexey Starikovskiy wrote:
> > Rolf Eike Beer wrote:
> > > Alexey Starikovskiy wrote:
> > > > Rolf Eike Beer wrote:
> > > > > Rolf Eike Beer wrote:
> > > > > > Hi,
> > > > > >
> > > > > > this happened while I removed my battery on bootup. Complete dmesg is
> > > > > > attached. Kernel is 2.6.24-rc1-git of yesterday (last commit was
> > > > > > d919fd433b5823d1cf9d0688eb2eec183de9b74c).
> > > > > Ok, I found out that it has nothing to do with the actual removal as it
> > > > > seems. When I start the laptop with battery already detached I get the
> > > > > same error.
> > > > Please check if this patch helps.
> > > It made things worse:
> > How about this patch?
>
> Ehm, that is the same patch as before!
Yes, sorry... Two patches in parallel -- not good.
> Btw: it has an empty From: line
I know, thanks.
> Eike
Patch updated.
ACPI: Battery: remove cycle from battery removal.

From:  <>

get_property() should not call battery_update() on absent battery to
avoid cycle and oops.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
---

 drivers/acpi/battery.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c2ce0ad..ca37db4 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -140,10 +140,11 @@ static int acpi_battery_get_property(struct power_supply *psy,
 {
 	struct acpi_battery *battery = to_acpi_battery(psy);
 
-	if ((!acpi_battery_present(battery)) &&
-	     psp != POWER_SUPPLY_PROP_PRESENT)
+	if (acpi_battery_present(battery)) {
+		/* run battery update only if it is present */
+		acpi_battery_update(battery);
+	} else if (psp != POWER_SUPPLY_PROP_PRESENT)
 		return -ENODEV;
-	acpi_battery_update(battery);
 	switch (psp) {
 	case POWER_SUPPLY_PROP_STATUS:
 		if (battery->state & 0x01)
@@ -457,6 +458,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
 		return;
 	device_remove_file(battery->bat.dev, &alarm_attr);
 	power_supply_unregister(&battery->bat);
+	battery->bat.dev = NULL;
 }
 
 static int acpi_battery_update(struct acpi_battery *battery)