3 files changed, 12 insertions, 7 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index e2c86b07b4..7ff7f1ca67 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -1084,7 +1084,6 @@ USBKeyboardRegisterKeyNotify (
 
   @retval EFI_SUCCESS              The notification function was unregistered successfully.
   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid
-  @retval EFI_NOT_FOUND            Cannot find the matching entry in database.
 
 **/
 EFI_STATUS
@@ -1133,6 +1132,9 @@ USBKeyboardUnregisterKeyNotify (
     }
   }
 
-  return EFI_NOT_FOUND;  
+  //
+  // Cannot find the matching entry in database.
+  //
+  return EFI_INVALID_PARAMETER;  
 }
 
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 27fa58f815..3389f62f98 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -3666,7 +3666,6 @@ ConSplitterTextInRegisterKeyNotify (
   @retval EFI_SUCCESS              The notification function was unregistered
                                    successfully.
   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid.
-  @retval EFI_NOT_FOUND            Can not find the matching entry in database.
 
 **/
 EFI_STATUS
@@ -3720,8 +3719,10 @@ ConSplitterTextInUnregisterKeyNotify (
     }
   }
 
-  return EFI_NOT_FOUND;
-
+  //
+  // NotificationHandle is not found in database
+  //
+  return EFI_INVALID_PARAMETER;
 }
 
 
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 44b62d7aed..d8305724b8 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -426,7 +426,6 @@ TerminalConInRegisterKeyNotify (
   @retval EFI_SUCCESS              The notification function was unregistered
                                    successfully.
   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid.
-  @retval EFI_NOT_FOUND            Can not find the matching entry in database.
 
 **/
 EFI_STATUS
@@ -470,7 +469,10 @@ TerminalConInUnregisterKeyNotify (
     }
   }
 
-  return EFI_NOT_FOUND;
+  //
+  // Can not find the matching entry in database.
+  //
+  return EFI_INVALID_PARAMETER;
 }
 
 /**