patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index cfc7774..f6218dd 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -582,7 +582,7 @@ end:
 static int
 acpi_battery_write_alarm (
        struct file             *file,
-       const char              *buffer,
+       const char              __user *buffer,
        unsigned long           count,
        void                    *data)
 {
@@ -679,6 +679,13 @@ acpi_battery_remove_fs (
        ACPI_FUNCTION_TRACE("acpi_battery_remove_fs");
 
        if (acpi_device_dir(device)) {
+               remove_proc_entry(ACPI_BATTERY_FILE_ALARM,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_BATTERY_FILE_STATUS,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_BATTERY_FILE_INFO,
+                                 acpi_device_dir(device));
+
                remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
                acpi_device_dir(device) = NULL;
        }