X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FDisk%2FPartition%2FDxe%2FMbr.c;h=d71698c82673dcb08641b05b5482c4c4eca4f755;hp=cf790d45e3a6654b82112fcbafc7292e1be9846b;hb=3c17ed18fa4b3fd08bdeda720cc0496b48ebf331;hpb=6626ad113ee5420201ea7c1f173f718978295eed

diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Mbr.c b/EdkModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
index cf790d45e3..d71698c826 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
@@ -162,10 +162,13 @@ Returns:
                       BlockIo->Media->BlockSize,
                       Mbr
                       );
-  if (EFI_ERROR (Status) || !PartitionValidMbr (Mbr, BlockIo->Media->LastBlock)) {
+  if (EFI_ERROR (Status)) {
     Found = Status;
     goto Done;
   }
+  if (!PartitionValidMbr (Mbr, BlockIo->Media->LastBlock)) {
+    goto Done;
+  }
   //
   // We have a valid mbr - add each partition
   //