ACPI: Fix oops on module insert/remove (Matthew Tippett)

drivers/acpi/ac.c

@@ -183,8 +183,10 @@ acpi_ac_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_ac_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_ac_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }

drivers/acpi/battery.c

@@ -669,8 +669,10 @@ acpi_battery_remove_fs (
 {
 	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);
 }

drivers/acpi/button.c

@@ -179,8 +179,10 @@ acpi_button_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_button_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_button_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }

drivers/acpi/fan.c

@@ -181,8 +181,10 @@ acpi_fan_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_fan_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_fan_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }

drivers/acpi/power.c

@@ -467,8 +467,10 @@ acpi_power_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_power_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_power_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }

drivers/acpi/processor.c

@@ -2348,8 +2348,10 @@ acpi_processor_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_processor_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_processor_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }

drivers/acpi/thermal.c

@@ -1123,8 +1123,10 @@ acpi_thermal_remove_fs (
 {
 	ACPI_FUNCTION_TRACE("acpi_thermal_remove_fs");
 
-	if (acpi_device_dir(device))
+	if (acpi_device_dir(device)) {
 		remove_proc_entry(acpi_device_bid(device), acpi_thermal_dir);
+		acpi_device_dir(device) = NULL;
+	}
 
 	return_VALUE(0);
 }