diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
index da470a044a..64897723e5 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.c
@@ -135,7 +135,7 @@ CpuIoCheckParameter (
   //
   // Check to see if Width is in the valid range
   //
-  if (Width > SMM_IO_UINT64) {
+  if (Width < 0 || Width > SMM_IO_UINT64) {
     return EFI_INVALID_PARAMETER;
   }
 
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
index 963b834839..b0d83ec16c 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
@@ -1,8 +1,7 @@
 #/** @file
 #  Module that produces the SMM CPU I/O 2 Protocol using the services of the I/O Library
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation.
-#
+#  Copyright (c) 2009 - 2010, Intel Corporation.  <BR>
 #  All rights reserved. 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