diff --git a/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c b/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c
index 8656785347..1bbb1a2584 100644
--- a/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c
+++ b/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c
@@ -1,7 +1,7 @@
 /** @file
   UART Serial Port library functions
 
-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -417,14 +417,6 @@ SerialPortSetAttributes (
     return RETURN_INVALID_PARAMETER;
   }
 
-  if ((*Parity < NoParity) || (*Parity > SpaceParity)) {
-    return RETURN_INVALID_PARAMETER;
-  }
-
-  if ((*StopBits < OneStopBit) || (*StopBits > TwoStopBits)) {
-    return RETURN_INVALID_PARAMETER;
-  }
-
   //
   // Map 5..8 to 0..3
   //
@@ -452,7 +444,7 @@ SerialPortSetAttributes (
       break;
 
     default:
-      break;
+      return RETURN_INVALID_PARAMETER;
   }
 
   switch (*StopBits) {
@@ -466,7 +458,7 @@ SerialPortSetAttributes (
       break;
 
     default:
-      break;
+      return RETURN_INVALID_PARAMETER;
   }
 
   //