diff options
| author | Ronald Cron <Ronald.Cron@arm.com> | 2015-01-06 15:48:19 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@Edk2> | 2015-01-06 15:48:19 +0000 |
| commit | f38d0dfbefb1beb480695b7f038c1be300a6b12c (patch) | |
| tree | 3ae3ce6b6c05981bd1db773acfbbedbdfff25b60 | |
| parent | 8a8641b5640b4eeb79a5dedfe48f81805b43c967 (diff) | |
| download | edk2-platforms-f38d0dfbefb1beb480695b7f038c1be300a6b12c.tar.xz | |
ArmJunoDxe/InstallFdt.c: Fix the closing of the simple file system protocol
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <Ronald.Cron@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16584 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c index a4220a1895..51ea7c00fe 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c @@ -174,14 +174,14 @@ JunoFdtStart ( Status = BootMonFs->OpenVolume (BootMonFs, &Fs);
if (EFI_ERROR (Status)) {
PrintMessage ("Warning: Fail to open file system that should contain FDT file.\n");
- goto UNLOAD_PROTOCOL;
+ goto CLOSE_PROTOCOL;
}
File = NULL;
Status = Fs->Open (Fs, &File, mFdtFileName, EFI_FILE_MODE_READ, 0);
if (EFI_ERROR (Status)) {
PrintMessage ("Warning: Fail to load FDT file '%s'.\n", mFdtFileName);
- goto UNLOAD_PROTOCOL;
+ goto CLOSE_PROTOCOL;
}
Size = 0;
@@ -189,7 +189,7 @@ JunoFdtStart ( FileInfo = AllocatePool (Size);
Status = File->GetInfo (File, &gEfiFileInfoGuid, &Size, FileInfo);
if (EFI_ERROR (Status)) {
- goto UNLOAD_PROTOCOL;
+ goto CLOSE_PROTOCOL;
}
// Get the file size
@@ -219,13 +219,13 @@ JunoFdtStart ( }
}
-UNLOAD_PROTOCOL:
+CLOSE_PROTOCOL:
// We do not need the FileSystem protocol
gBS->CloseProtocol (
- ControllerHandle,
- &gEfiSimpleFileSystemProtocolGuid,
- DriverBinding->ImageHandle,
- ControllerHandle);
+ ControllerHandle,
+ &gEfiSimpleFileSystemProtocolGuid,
+ gImageHandle,
+ ControllerHandle);
return Status;
}
|