[edk2,platforms:,06/11] Applications/SpiTool: Fix bug in error test

Message ID 1504271303-1782-7-git-send-email-mw@semihalf.com
State Superseded
Headers show
Series
  • Untitled series #3719
Related show

Commit Message

Marcin Wojtas Sept. 1, 2017, 1:08 p.m.
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Fix a misplaced closing parenthesis.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Signed-off-by: Marcin Wojtas <mw@semihalf.com>

---
 Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.3.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm Sept. 1, 2017, 2:48 p.m. | #1
On Fri, Sep 01, 2017 at 03:08:18PM +0200, Marcin Wojtas wrote:
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> 

> Fix a misplaced closing parenthesis.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> Signed-off-by: Marcin Wojtas <mw@semihalf.com>


Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c

> index b6dc54f..e6e1007 100644

> --- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c

> +++ b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c

> @@ -378,7 +378,7 @@ EFI_STATUS              Status;

>        FilePath = (CHAR16 *) FileStr;

>        Status = ShellIsFile (FilePath);

>        // When read file into flash, file doesn't have to exist

> -      if (EFI_ERROR(Status && !(Flag & READ_FILE))) {

> +      if (EFI_ERROR (Status) && !(Flag & READ_FILE)) {

>          Print (L"sf: Wrong FilePath parameter!\n");

>          return SHELL_ABORTED;

>        }

> -- 

> 1.8.3.1

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c
index b6dc54f..e6e1007 100644
--- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c
+++ b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c
@@ -378,7 +378,7 @@  EFI_STATUS              Status;
       FilePath = (CHAR16 *) FileStr;
       Status = ShellIsFile (FilePath);
       // When read file into flash, file doesn't have to exist
-      if (EFI_ERROR(Status && !(Flag & READ_FILE))) {
+      if (EFI_ERROR (Status) && !(Flag & READ_FILE)) {
         Print (L"sf: Wrong FilePath parameter!\n");
         return SHELL_ABORTED;
       }