linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
index 35c6af8..263322b 100644 (file)
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -155,12 +155,13 @@ acpi_system_write_debug(struct file *file,
 {
        char debug_string[12] = { '\0' };
 
+       ACPI_FUNCTION_TRACE("acpi_system_write_debug");
 
        if (count > sizeof(debug_string) - 1)
-               return -EINVAL;
+               return_VALUE(-EINVAL);
 
        if (copy_from_user(debug_string, buffer, count))
-               return -EFAULT;
+               return_VALUE(-EFAULT);
 
        debug_string[count] = '\0';
 
@@ -172,10 +173,10 @@ acpi_system_write_debug(struct file *file,
                acpi_dbg_level = simple_strtoul(debug_string, NULL, 0);
                break;
        default:
-               return -EINVAL;
+               return_VALUE(-EINVAL);
        }
 
-       return count;
+       return_VALUE(count);
 }
 
 static int __init acpi_debug_init(void)
@@ -184,9 +185,10 @@ static int __init acpi_debug_init(void)
        int error = 0;
        char *name;
 
+       ACPI_FUNCTION_TRACE("acpi_debug_init");
 
        if (acpi_disabled)
-               return 0;
+               return_VALUE(0);
 
        /* 'debug_layer' [R/W] */
        name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
@@ -211,12 +213,15 @@ static int __init acpi_debug_init(void)
                goto Error;
 
       Done:
-       return error;
+       return_VALUE(error);
 
       Error:
+       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                         "Unable to create '%s' proc fs entry\n", name));
+
        remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LEVEL, acpi_root_dir);
        remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);
-       error = -ENODEV;
+       error = -EFAULT;
        goto Done;
 }