From patchwork Thu Nov 17 07:04:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 126119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 5E21FB71EA for ; Thu, 17 Nov 2011 18:05:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B821287F2; Thu, 17 Nov 2011 08:04:58 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YjDjd0zCWw3L; Thu, 17 Nov 2011 08:04:58 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F0C17287D3; Thu, 17 Nov 2011 08:04:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02AB8287D3 for ; Thu, 17 Nov 2011 08:04:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id knKT03eOLA56 for ; Thu, 17 Nov 2011 08:04:55 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by theia.denx.de (Postfix) with ESMTP id 92CB6287CC for ; Thu, 17 Nov 2011 08:04:54 +0100 (CET) Received: from benhur.adnet.avionic-design.de (p548E12B2.dip0.t-ipconnect.de [84.142.18.178]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lutwv-1Qj6yx0Ul7-01083Y; Thu, 17 Nov 2011 08:04:50 +0100 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id 4C5082C411D; Thu, 17 Nov 2011 08:04:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 972E02A281BB; Thu, 17 Nov 2011 08:04:49 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0jUlIPZi5dIA; Thu, 17 Nov 2011 08:04:37 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id BAFE82A2802C; Thu, 17 Nov 2011 08:04:37 +0100 (CET) From: Thierry Reding To: u-boot@lists.denx.de Date: Thu, 17 Nov 2011 08:04:37 +0100 Message-Id: <1321513477-12877-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.7.3 X-Provags-ID: V02:K0:RwbX+XW++EqkNp25c+3dtClhv3EZ/LyHrFVBYQZoKFk +ord+uo+/MG/4av/Hf8Bo/sXkonFyoixYZlBan7Z+6KoE2fMn1 WnSyxP12qY0qRUfI6w4z0WVUCltrpdLzJU5DPdlIItSTaww19k wReBodrJyHj5cMVUBEOXDIuMza5UNW5H7bHOzcwTJw2Nt0jwfS u+Zu/GNs1rBRIpP1108JCzjrKGIHVe73KC4WjEuTIeg7Qn8Avu rraP5Buh3214npfzr+v42EEnA/f3W2zkvDIv4koh6/QsfxiM/A PIWCgyR+qVFiGXTxXW5Sow2WN5oUZDVTwutHNHO9JfMSkDzjSL BRK7/T8i+yguFZs04Cjj9kyuRZMBnAX8+XXrR869VfRUpv3XmA g+SMKJR6ru0GsN7OTZgLSwqrKVyhF9IKG5xvR/IM29Fs5tLHP7 iRAVq Cc: Tom Warren Subject: [U-Boot] [PATCH] disk: part_efi: Fix parameters passed to is_gpt_valid(). X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- 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; }