diff --git a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
index 1f33bd1ef0..f208fecd6e 100644
--- a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
+++ b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
@@ -310,7 +310,7 @@ PL011UartWrite (
     // Wait until UART able to accept another char
     while ((MmioRead32 (UartBase + UARTFR) & UART_TX_FULL_FLAG_MASK));
     
-    MmioWrite8 (UartBase + UARTDR, *Buffer);
+    MmioWrite8 (UartBase + UARTDR, *Buffer++);
   }
 
   return NumberOfBytes;
@@ -338,7 +338,7 @@ PL011UartRead (
 
   for (Count = 0; Count < NumberOfBytes; Count++, Buffer++) {
     while ((MmioRead32 (UartBase + UARTFR) & UART_RX_EMPTY_FLAG_MASK) != 0);
-	*Buffer = MmioRead8 (UartBase + UARTDR);
+    *Buffer = MmioRead8 (UartBase + UARTDR);
   }
 
   return NumberOfBytes;