From: mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 29 Nov 2010 21:58:46 +0000 (+0000)
Subject: Sync update to improve compiler compatibility
X-Git-Tag: edk2-stable201903~15367
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e

Sync update to improve compiler compatibility


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11104 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
index 7afd87bc1e..0f3ac51f55 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c
@@ -271,6 +271,7 @@ Returns:
   EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;
   UINTN                               EntryCount;
   UINTN                               Index;
+  BOOLEAN                             RemainingDevicePathContainsFlowControl; 
 
   //
   // Check RemainingDevicePath validation
@@ -356,6 +357,11 @@ Returns:
       return Status;
     }
 
+    //
+    // See if RemainingDevicePath has a Flow Control device path node
+    //
+    RemainingDevicePathContainsFlowControl = ContainsFlowControl (RemainingDevicePath);
+
     for (Index = 0; Index < EntryCount; Index++) {
       if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {
         Status = gBS->OpenProtocol (
@@ -366,9 +372,10 @@ Returns:
                         Handle,
                         EFI_OPEN_PROTOCOL_GET_PROTOCOL
                         );
-        if (!EFI_ERROR (Status) &&
-            (ContainsFlowControl (RemainingDevicePath) ^ ContainsFlowControl (DevicePath))) {
-          Status = EFI_UNSUPPORTED;
+        if (!EFI_ERROR (Status)) {
+          if (RemainingDevicePathContainsFlowControl ^ ContainsFlowControl (DevicePath)) {
+            Status = EFI_UNSUPPORTED;
+          }
         }
         break;
       }