diff options
| author | Eric Dong <eric.dong@intel.com> | 2016-01-08 05:21:55 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@Edk2> | 2016-01-08 05:21:55 +0000 |
| commit | 20fe1625567d0bc502a63818e3f416613bab813c (patch) | |
| tree | 22aa4ec2894ba0b431091f38be2116188c7beb47 /MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | |
| parent | 0507449955c5c629cec196b62986afbb91203ed9 (diff) | |
| download | edk2-platforms-20fe1625567d0bc502a63818e3f416613bab813c.tar.xz | |
Refine error handle code, avoid assert when load this module twice.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19625 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Library/FileExplorerLib/FileExplorer.c')
| -rw-r--r-- | MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c index bcf3ec97f6..9714dbcf5d 100644 --- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c +++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c @@ -1,7 +1,7 @@ /** @file
File explorer related functions.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
@@ -1442,7 +1442,12 @@ FileExplorerLibConstructor ( &gFileExplorerPrivate.FeConfigAccess,
NULL
);
- ASSERT_EFI_ERROR (Status);
+ if (Status == EFI_ALREADY_STARTED) {
+ return EFI_SUCCESS;
+ }
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
//
// Post our File Explorer VFR binary to the HII database.
@@ -1486,17 +1491,19 @@ FileExplorerLibDestructor ( ASSERT (gHiiVendorDevicePath != NULL);
- Status = gBS->UninstallMultipleProtocolInterfaces (
- gFileExplorerPrivate.FeDriverHandle,
- &gEfiDevicePathProtocolGuid,
- gHiiVendorDevicePath,
- &gEfiHiiConfigAccessProtocolGuid,
- &gFileExplorerPrivate.FeConfigAccess,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
-
- HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
+ if (gFileExplorerPrivate.FeDriverHandle != NULL) {
+ Status = gBS->UninstallMultipleProtocolInterfaces (
+ gFileExplorerPrivate.FeDriverHandle,
+ &gEfiDevicePathProtocolGuid,
+ gHiiVendorDevicePath,
+ &gEfiHiiConfigAccessProtocolGuid,
+ &gFileExplorerPrivate.FeConfigAccess,
+ NULL
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
+ }
FreePool (gHiiVendorDevicePath);
|