Index: BiosKeyboard.c
===================================================================
--- BiosKeyboard.c	(revision 16546)
+++ BiosKeyboard.c	(working copy)
@@ -2202,15 +2202,18 @@
 
   Status = KeyboardWrite (BiosKeyboardPrivate, 0xed);
   if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Exit;
   }  
   Status = KeyboardWaitForValue (BiosKeyboardPrivate, 0xfa, KEYBOARD_WAITFORVALUE_TIMEOUT);
   if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Exit;
   }
   Status = KeyboardWrite (BiosKeyboardPrivate, Command);
   if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Exit;
   }  
   //
   // Call Legacy BIOS Protocol to set whatever is necessary
@@ -2219,6 +2222,7 @@
 
   Status = EFI_SUCCESS;
 
+Exit:
   //
   // Leave critical section and return
   //