Merge tag 'v2022.01-rc4' into next
Prepare v2022.01-rc4
This commit is contained in:
@@ -296,8 +296,11 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc)
|
||||
case IF_TYPE_VIRTIO:
|
||||
puts("VirtIO");
|
||||
break;
|
||||
case IF_TYPE_EFI_MEDIA:
|
||||
puts("EFI");
|
||||
break;
|
||||
default:
|
||||
puts ("UNKNOWN");
|
||||
puts("UNKNOWN");
|
||||
break;
|
||||
}
|
||||
printf (" device %d -- Partition Type: %s\n\n",
|
||||
@@ -427,7 +430,8 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str,
|
||||
* Always should be done, otherwise hw partition 0 will return stale
|
||||
* data after displaying a non-zero hw partition.
|
||||
*/
|
||||
part_init(*dev_desc);
|
||||
if ((*dev_desc)->if_type == IF_TYPE_MMC)
|
||||
part_init(*dev_desc);
|
||||
#endif
|
||||
|
||||
cleanup:
|
||||
|
||||
Reference in New Issue
Block a user