1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index c28c41b3180b..bd72319a38f0 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -224,7 +224,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
 
         status = acpi_hw_read(&in_byte, &gpe_register_info->status_address);
         if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
+                return (status);
         }
 
         if (register_bit & in_byte) {
@@ -234,9 +234,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
         /* Set return value */
 
         (*event_status) = local_event_status;
-
-      unlock_and_exit:
-        return (status);
+        return (AE_OK);
 }
 
 /******************************************************************************