diff options
| author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-29 21:52:24 +0000 |
|---|---|---|
| committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-29 21:52:24 +0000 |
| commit | e74c3676e651f79d27afa986c5837eb1e103fe84 (patch) | |
| tree | a2c3c0a9423b6f12fa98a4db109f2093305cda44 /Nt32Pkg | |
| parent | b4c900588691090ae931a630b93f5c8753677e68 (diff) | |
| download | edk2-e74c3676e651f79d27afa986c5837eb1e103fe84.zip edk2-e74c3676e651f79d27afa986c5837eb1e103fe84.tar.gz edk2-e74c3676e651f79d27afa986c5837eb1e103fe84.tar.bz2 | |
Fix ICC 9.1 build break
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11103 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Nt32Pkg')
| -rw-r--r-- | Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c index bd74247..0dc0313 100644 --- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c +++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c @@ -175,6 +175,7 @@ Returns: EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;
UINTN EntryCount;
UINTN Index;
+ BOOLEAN RemainingDevicePathContainsFlowControl;
//
// Check RemainingDevicePath validation
@@ -261,6 +262,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 (
@@ -271,9 +277,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;
}
|