Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[~andy/linux] / drivers / acpi / acpica / nsxfeval.c

diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index 481a6b4a9b2ffbeb64418abd6b458697faa74eb5..e973e311f856597fcb9474ea9f7eabaa0a76b1da 100644 (file)
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -42,7 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
+
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -138,7 +139,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
                /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
 
-               ACPI_FREE(return_buffer->pointer);
+               ACPI_FREE_BUFFER(*return_buffer);
                return_buffer->pointer = NULL;
        }
 
@@ -441,7 +442,7 @@ acpi_evaluate_object(acpi_handle handle,
                acpi_ex_exit_interpreter();
        }
 
-      cleanup:
+cleanup:
 
        /* Free the input parameter list (if we created one) */
 
@@ -617,10 +618,10 @@ acpi_walk_namespace(acpi_object_type type,
                                        descending_callback, ascending_callback,
                                        context, return_value);
 
-      unlock_and_exit2:
+unlock_and_exit2:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_read_lock(&acpi_gbl_namespace_rw_lock);
        return_ACPI_STATUS(status);
 }
@@ -864,7 +865,7 @@ acpi_attach_data(acpi_handle obj_handle,
 
        status = acpi_ns_attach_data(node, handler, data);
 
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
@@ -910,7 +911,7 @@ acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)
 
        status = acpi_ns_detach_data(node, handler);
 
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }
@@ -957,7 +958,7 @@ acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)
 
        status = acpi_ns_get_attached_data(node, handler, data);
 
-      unlock_and_exit:
+unlock_and_exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
 }