vserver 1.9.5.x5

[linux-2.6.git] / drivers / acpi / resources / rsutils.c

diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 01dea9b..ee9ce13 100644 (file)
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2004, R. Byron Moore
+ * Copyright (C) 2000 - 2005, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -175,7 +175,7 @@ acpi_rs_get_crs_method_data (
  *              and the contents of the callers buffer is undefined.
  *
  ******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_rs_get_prs_method_data (
        acpi_handle                     handle,
@@ -210,6 +210,7 @@ acpi_rs_get_prs_method_data (
        acpi_ut_remove_reference (obj_desc);
        return_ACPI_STATUS (status);
 }
+#endif  /*  ACPI_FUTURE_USAGE  */
 
 
 /*******************************************************************************
@@ -338,6 +339,13 @@ acpi_rs_set_srs_method_data (
         * Execute the method, no return value
         */
        status = acpi_ns_evaluate_relative ("_SRS", &info);
+       if (ACPI_SUCCESS (status)) {
+               /* Delete any return object (especially if implicit_return is enabled) */
+
+               if (info.return_object) {
+                       acpi_ut_remove_reference (info.return_object);
+               }
+       }
 
        /*
         * Clean up and return the status from acpi_ns_evaluate_relative