From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::243; helo=mail-lf0-x243.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C92C8226838F1 for ; Tue, 17 Apr 2018 18:55:11 -0700 (PDT) Received: by mail-lf0-x243.google.com with SMTP id d20-v6so233092lfe.3 for ; Tue, 17 Apr 2018 18:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ZcT59G3/qyEHeuKA09d8Q1P79TjwMf8Y/V8G+oFhuPk=; b=EGaAGoMRYSAwJJjwDtcD5IxL5sbMlrBBCN2L7RLSzE0uwoD7zqQhIdfKmVgyL5tJtn 3TCOSrE9Z0q/opMjSh/RWS1hgTD/gv1yCeTzVs/e5JThYYWJSgWC3q3IaVbn5/ZHZNBH hjlKdXh9JHg2MHglQe4IgMuPNRKf0Mb4FEyRDTBkPVcWbXpPiWjXuZK3Zy97tGbMuw5u n2n8EMYOAns3pLFaNPhkmJrgpnfMr069YyHzEBTk5QJ6B2FFmE4DUzUv5Ix6VVWbfIyW CiwYdGBYpZwz5Y776pL2aQFZTuTrE0AjJk8HJEpFPd4TQ4rVu19zdSe0VWchHZ1bFmVz Tv5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZcT59G3/qyEHeuKA09d8Q1P79TjwMf8Y/V8G+oFhuPk=; b=IKsL6D/cvX9GJRVijpY/NHTPw77drrSUbNikCxnEeIQfMoMEu3NUSrL5NwZWS+pz3M kFV+2+GYo3DTt4fEuXiU9BdQgQLIDugYIfbemriAFrs5bM9gpr9i7bvuRkIpCZY5t7LN 45VhHO2red8R4niILnexPSe0YBefs/vmN+gBm3wiVT0U2pcQDpNHWKa1Er77Qn1HqI5j Ig/spGPDxPRpnUFJn7JSUFyOjNxjyHdTieUF3g3rpsMM/5gmNZUmzXehqLe35c98HG0r DR7U4PXi/hJeAY1RRiHwsFZ2qQRApqMJNeBNeqI22WRyU96idcA4KIU4woT80uWwC/Uv RBKA== X-Gm-Message-State: ALQs6tCufGbTi4Zfrvhrk5MAeq+gG8GbP8v0FPB9qCpE5BZ4qYb96xDL GsV2/Kbs8ymDUE7f1zBH1Eyfe2bOaz8= X-Google-Smtp-Source: AIpwx4+itmXr0tqa/xT6fpNNZKhtVVqI5Ap4v7VjbBrG01Y8mEihgqSCaG4qAFOEUyurjUu0DiFHaA== X-Received: by 2002:a19:dd1c:: with SMTP id u28-v6mr86380lfg.140.1524016508824; Tue, 17 Apr 2018 18:55:08 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id g1sm16649lje.58.2018.04.17.18.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Apr 2018 18:55:08 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com Date: Wed, 18 Apr 2018 03:54:35 +0200 Message-Id: <1524016475-18667-1-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 Subject: [platforms PATCH 1/1] Marvell/Drivers: MvFvbDxe: Fix uninstallation of protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2018 01:55:12 -0000 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 --- 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