> -----Original Message----- > From: u-boot-boun...@lists.denx.de > [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Thierry Reding > Sent: Thursday, November 17, 2011 12:35 PM > To: u-boot@lists.denx.de > Cc: Tom Warren > Subject: [U-Boot] [PATCH] disk: part_efi: Fix parameters > passed to is_gpt_valid(). > > Something apparently went wrong when the patch in commit deb5ca8 was > applied. Commit f75dd58 changed the type of gpt_head to be a > pointer and > correctly adjusted the calls to is_gpt_valid(). But when deb5ca8 got > applied, the gpt_head was again reverted to &(gpt_head), which was the > state before deb5ca8. > > This commit fixes the passing of gpt_head into is_gpt_valid(). > > Signed-off-by: Thierry Reding <thierry.red...@avionic-design.de> > --- > disk/part_efi.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/disk/part_efi.c b/disk/part_efi.c > index e7f2714..ddf80a7 100644 > --- a/disk/part_efi.c > +++ b/disk/part_efi.c > @@ -130,7 +130,7 @@ void print_part_efi(block_dev_desc_t * dev_desc) > } > /* This function validates AND fills in the GPT header > and PTE */ > if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, > - &(gpt_head), &gpt_pte) != 1) { > + gpt_head, &gpt_pte) != 1) { > printf("%s: *** ERROR: Invalid GPT ***\n", __func__); > return; > } > @@ -169,7 +169,7 @@ int > get_partition_info_efi(block_dev_desc_t * dev_desc, int part, > > /* This function validates AND fills in the GPT header > and PTE */ > if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, > - &(gpt_head), &gpt_pte) != 1) { > + gpt_head, &gpt_pte) != 1) { > printf("%s: *** ERROR: Invalid GPT ***\n", __func__); > return -1; > } > --
I had already posted 2 revisions of this patch: http://lists.denx.de/pipermail/u-boot/2011-November/109791.html http://lists.denx.de/pipermail/u-boot/2011-November/109899.html And they are included in this pull request: http://lists.denx.de/pipermail/u-boot/2011-November/110017.html > 1.7.7.3 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
