public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [platforms PATCH 1/1] Marvell/Drivers: MvFvbDxe: Fix uninstallation of protocol
@ 2018-04-18  1:54 Marcin Wojtas
  2018-04-19 10:33 ` Ard Biesheuvel
  0 siblings, 1 reply; 2+ messages in thread
From: Marcin Wojtas @ 2018-04-18  1:54 UTC (permalink / raw)
  To: edk2-devel
  Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, jinghua, mw, jsd,
	jaz

Recently added installation of gEdkiiNvVarStoreFormattedGuid
introduced bug in the error path. gBS->UninstallProtocolInterface
takes an actual handle as an argument (not the pointer). Fix this
and on the occasion fix indentation of multiline call.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
index 6e583a3..1a41a4f 100644
--- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
@@ -1142,9 +1142,9 @@ ErrorSetMemAttr:
   gDS->RemoveMemorySpace (RegionBaseAddress, RuntimeMmioRegionSize);
 
 ErrorAddSpace:
-  gBS->UninstallProtocolInterface (&gImageHandle,
-                  &gEdkiiNvVarStoreFormattedGuid,
-                  NULL);
+  gBS->UninstallProtocolInterface (gImageHandle,
+         &gEdkiiNvVarStoreFormattedGuid,
+         NULL);
 
 ErrorInstallNvVarStoreFormatted:
   gBS->UninstallMultipleProtocolInterfaces (&mFvbDevice->Handle,
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [platforms PATCH 1/1] Marvell/Drivers: MvFvbDxe: Fix uninstallation of protocol
  2018-04-18  1:54 [platforms PATCH 1/1] Marvell/Drivers: MvFvbDxe: Fix uninstallation of protocol Marcin Wojtas
@ 2018-04-19 10:33 ` Ard Biesheuvel
  0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2018-04-19 10:33 UTC (permalink / raw)
  To: Marcin Wojtas
  Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
	Neta Zur Hershkovits, Hua Jing, Jan Dąbroś,
	Grzegorz Jaszczyk

On 18 April 2018 at 03:54, Marcin Wojtas <mw@semihalf.com> wrote:
> Recently added installation of gEdkiiNvVarStoreFormattedGuid
> introduced bug in the error path. gBS->UninstallProtocolInterface
> takes an actual handle as an argument (not the pointer). Fix this
> and on the occasion fix indentation of multiline call.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

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

Pushed as 3454e932107c7524f6a89fcab35d430d0b422b2e

Thanks

> ---
>  Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> index 6e583a3..1a41a4f 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> @@ -1142,9 +1142,9 @@ ErrorSetMemAttr:
>    gDS->RemoveMemorySpace (RegionBaseAddress, RuntimeMmioRegionSize);
>
>  ErrorAddSpace:
> -  gBS->UninstallProtocolInterface (&gImageHandle,
> -                  &gEdkiiNvVarStoreFormattedGuid,
> -                  NULL);
> +  gBS->UninstallProtocolInterface (gImageHandle,
> +         &gEdkiiNvVarStoreFormattedGuid,
> +         NULL);
>
>  ErrorInstallNvVarStoreFormatted:
>    gBS->UninstallMultipleProtocolInterfaces (&mFvbDevice->Handle,
> --
> 2.7.4
>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-19 10:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-18  1:54 [platforms PATCH 1/1] Marvell/Drivers: MvFvbDxe: Fix uninstallation of protocol Marcin Wojtas
2018-04-19 10:33 ` Ard Biesheuvel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox