--- battery.c.orig	2002-12-15 14:14:51.000000000 -0500
+++ battery.c	2002-12-15 14:11:29.000000000 -0500
@@ -658,8 +658,10 @@
 {
 	ACPI_FUNCTION_TRACE("acpi_battery_remove_fs");
 
-	if (acpi_device_dir(device)) 
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }