From 52659efb9c37066f6bf5f001374dd1a115cc1455 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Tue, 1 Jul 2014 09:25:30 +0000 Subject: [PATCH] EmbeddedPkg/SerialDxe: Fixed the mixture of RETURN_STATUS and EFI_STATUS Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15607 6f19259b-4bc3-4df7-8a09-765794883524 --- EmbeddedPkg/SerialDxe/SerialIo.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/EmbeddedPkg/SerialDxe/SerialIo.c b/EmbeddedPkg/SerialDxe/SerialIo.c index 5a20e3c14b..0bdf4b9f63 100644 --- a/EmbeddedPkg/SerialDxe/SerialIo.c +++ b/EmbeddedPkg/SerialDxe/SerialIo.c @@ -162,12 +162,13 @@ SerialSetAttributes ( IN EFI_STOP_BITS_TYPE StopBits ) { - EFI_STATUS Status; - EFI_TPL Tpl; + RETURN_STATUS ReturnStatus; + EFI_STATUS Status; + EFI_TPL Tpl; - Status = SerialPortSetAttributes (&BaudRate, &ReceiveFifoDepth, &Timeout, &Parity, &DataBits, &StopBits); - if (EFI_ERROR(Status)) { - return Status; + ReturnStatus = SerialPortSetAttributes (&BaudRate, &ReceiveFifoDepth, &Timeout, &Parity, &DataBits, &StopBits); + if (RETURN_ERROR (ReturnStatus)) { + return EFI_DEVICE_ERROR; } // -- 2.39.2