diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
index 00889a246d..298b6b2da3 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
@@ -142,7 +142,7 @@ InitializeDebugPortDriver (
              );
   ASSERT_EFI_ERROR (Status);
 
-  return EFI_SUCCESS;
+  return Status;
 }
 
 /**
@@ -241,14 +241,14 @@ DebugPortSupported (
     return Status;
   }
 
-  gBS->CloseProtocol (
-        ControllerHandle,
-        &gEfiSerialIoProtocolGuid,
-        This->DriverBindingHandle,
-        ControllerHandle
-        );
+  Status = gBS->CloseProtocol (
+                  ControllerHandle,
+                  &gEfiSerialIoProtocolGuid,
+                  This->DriverBindingHandle,
+                  ControllerHandle
+                  );
 
-  return EFI_SUCCESS;
+  return Status;
 }
 
 /**