summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-10-10 07:57:51 +0000
committerTom Rini <trini@ti.com>2012-10-19 13:42:33 -0700
commit6ab6a650a418f213f51f47c8263cd635130b3c3a (patch)
tree62e6ed90e2f135d18b127bc146f302b6441d8873
parent39c7a2635227f5754393e954cb57249328e83cee (diff)
downloadtalos-obmc-uboot-6ab6a650a418f213f51f47c8263cd635130b3c3a.tar.gz
talos-obmc-uboot-6ab6a650a418f213f51f47c8263cd635130b3c3a.zip
disk: initialize name/part fields when returning a whole disk
When get_device_and_partition() finds a disk without a partition table, under some conditions, it "returns" a disk_partition_t that describes the entire raw disk. Make sure to initialize all fields in the partition descriptor in that case. The value chosen for name is just some arbitrary descriptive string. The value chosen for info matches the check at the end of get_device_and_partition(). However, it's probably not that important; it's not obvious that the value is really used. Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--disk/part.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/disk/part.c b/disk/part.c
index a0c77ddc9d..8ba3cdeaa0 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -561,6 +561,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
info->size = (*dev_desc)->lba;
info->blksz = (*dev_desc)->blksz;
info->bootable = 0;
+ strcpy((char *)info->type, BOOT_PART_TYPE);
+ strcpy((char *)info->name, "Whole Disk");
#ifdef CONFIG_PARTITION_UUIDS
info->uuid[0] = 0;
#endif
OpenPOWER on IntegriCloud