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

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 4c6fb47..a322828 100644 (file)
--- a/drivers/acpi/ac.c
+++ b/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);
 }

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index d9f2b3c..c821ef4 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/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);
 }

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index ef1861b..ef82cf9 100644 (file)
--- a/drivers/acpi/button.c
+++ b/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);
 }

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 77a79ee..e262dd1 100644 (file)
--- a/drivers/acpi/fan.c
+++ b/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);
 }

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 72df49e..bbca62c 100644 (file)
--- a/drivers/acpi/power.c
+++ b/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);
 }

diff --git a/drivers/acpi/processor.c b/drivers/acpi/processor.c
index 8167bf2..961f8ce 100644 (file)
--- a/drivers/acpi/processor.c
+++ b/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);
 }

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 80f3785..536d8aa 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/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);
 }