From bf19b4402b3a8addc54f8391aa58a02bf0b9066c Mon Sep 17 00:00:00 2001
From: niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 12 Apr 2010 09:23:50 +0000
Subject: [PATCH 1/1] Fix ICC build failure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10360 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
index b842112230..35b83f96bb 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
@@ -195,6 +195,7 @@ SerialControllerDriverSupported (
   EFI_OPEN_PROTOCOL_INFORMATION_ENTRY       *OpenInfoBuffer;
   UINTN                                     EntryCount;
   UINTN                                     Index;
+  BOOLEAN                                   HasFlowControl;
 
   //
   // Check RemainingDevicePath validation
@@ -298,9 +299,11 @@ SerialControllerDriverSupported (
                         Controller,
                         EFI_OPEN_PROTOCOL_GET_PROTOCOL
                         );
-        if (!EFI_ERROR (Status) &&
-            (ContainsFlowControl (RemainingDevicePath) ^ ContainsFlowControl (DevicePath))) {
-          Status = EFI_UNSUPPORTED;
+        if (!EFI_ERROR (Status)) {
+          HasFlowControl = ContainsFlowControl (RemainingDevicePath);
+          if (HasFlowControl ^ ContainsFlowControl (DevicePath)) {
+            Status = EFI_UNSUPPORTED;
+          }
         }
         break;
       }
-- 
2.39.2