From 53f97bdc4433532ba824b1db98228c7037fd978a Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Mon, 30 Nov 2015 21:11:29 +0000 Subject: CorebootPayloadPkg PlatformHookLib: Fix GCC build failure Add return status check to fix GCC build failure below. error: right-hand operand of comma expression has no effect [-Werror=unused-value] ((_gPcd_BinaryPatch_PcdSerialUseMmio = (Value)), RETURN_SUCCESS) error: right-hand operand of comma expression has no effect [-Werror=unused-value] ((_gPcd_BinaryPatch_PcdSerialRegisterBase = (Value)), RETURN_SUCCESS) http://article.gmane.org/gmane.comp.bios.edk2.devel/4949 Cc: Maurice Ma Cc: Prince Agyeman Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Suggested-by: Laszlo Ersek Signed-off-by: Star Zeng Reviewed-by: Laszlo Ersek Reviewed-by: Maurice Ma git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19069 6f19259b-4bc3-4df7-8a09-765794883524 --- CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c') diff --git a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c index 10fd332fe5..8449997050 100644 --- a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c +++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c @@ -45,11 +45,17 @@ PlatformHookSerialPortInitialize ( } if (SerialRegAccessType == 2) { //MMIO - PcdSetBoolS (PcdSerialUseMmio, TRUE); + Status = PcdSetBoolS (PcdSerialUseMmio, TRUE); } else { //IO - PcdSetBoolS (PcdSerialUseMmio, FALSE); + Status = PcdSetBoolS (PcdSerialUseMmio, FALSE); + } + if (RETURN_ERROR (Status)) { + return Status; + } + Status = PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase); + if (RETURN_ERROR (Status)) { + return Status; } - PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase); return RETURN_SUCCESS; } -- cgit v1.2.3