BlockIo->Media->BlockSize,\r
Mbr\r
);\r
- if (EFI_ERROR (Status) || !PartitionValidMbr (Mbr, BlockIo->Media->LastBlock)) {\r
+ if (EFI_ERROR (Status)) {\r
Found = Status;\r
goto Done;\r
}\r
+ if (!PartitionValidMbr (Mbr, BlockIo->Media->LastBlock)) {\r
+ goto Done;\r
+ }\r
//\r
// We have a valid mbr - add each partition\r
//\r
if (DevicePathType (LastDevicePathNode) == MEDIA_DEVICE_PATH &&\r
DevicePathSubType (LastDevicePathNode) == MEDIA_HARDDRIVE_DP\r
) {\r
- gBS->CopyMem (&ParentHdDev, LastDevicePathNode, sizeof (ParentHdDev));\r
+ CopyMem (&ParentHdDev, LastDevicePathNode, sizeof (ParentHdDev));\r
} else {\r
LastDevicePathNode = NULL;\r
}\r
}\r
\r
Done:\r
- gBS->FreePool (Mbr);\r
+ FreePool (Mbr);\r
\r
return Found;\r
}\r