From: Michael Kinney <michael.d.kinney@intel.com>
Date: Tue, 10 Jan 2017 17:41:01 +0000 (-0800)
Subject: QuarkPlatformPkg/Tpm12DeviceLibAtmelI2c: Fix GCC build issues
X-Git-Tag: edk2-stable201903~4778
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=df3f02df1bde40c2a0d486d3ca6bd529c3654049

QuarkPlatformPkg/Tpm12DeviceLibAtmelI2c: Fix GCC build issues

https://bugzilla.tianocore.org/show_bug.cgi?id=335

Fix build issues with GCC49.  There are local variables that
may be used before initialized in some paths.

Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Lee Leahy <leroy.p.leahy@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>
---

diff --git a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
index 3aab530643..894e1e3674 100644
--- a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
+++ b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
@@ -59,6 +59,8 @@ WriteTpmBufferMultiple (
   UINTN                   Index;
   UINTN                   PartialLength;
 
+  Status = EFI_SUCCESS;
+
   I2CDeviceAddr.I2CDeviceAddress = ATMEL_I2C_TPM_SLAVE_ADDRESS;
 
   DEBUG ((EFI_D_VERBOSE, "WriteTpmBufferMultiple: Addr=%02x  Length=%02x\n", I2CDeviceAddr.I2CDeviceAddress, Length));
@@ -112,6 +114,8 @@ ReadTpmBufferMultiple (
   UINTN                   Index;
   UINTN                   PartialLength;
 
+  Status = EFI_SUCCESS;
+
   I2CDeviceAddr.I2CDeviceAddress = ATMEL_I2C_TPM_SLAVE_ADDRESS;
   WriteLength = 0;
 
@@ -262,6 +266,13 @@ Tpm12SubmitCommand (
   INT64                Cycle;
   INT64                Delta;
 
+  //
+  // Initialize local variables
+  //
+  Start   = 0;
+  End     = 0;
+  Total   = 0;
+
   //
   // Make sure response buffer is big enough to hold a response header
   //
@@ -275,13 +286,6 @@ Tpm12SubmitCommand (
   //
   Current = GetPerformanceCounter();
 
-  //
-  // Initialize local variables
-  //
-  Start = 0;
-  End   = 0;
-  Total = 0;
-
   //
   // Retrieve the performance counter properties and compute the number of
   // performance counter ticks required to reach the maximum TIS timeout of