[I/Unstable/OEM-5.13] [PATCH 09/10] platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd()

Kai-Heng Feng kai.heng.feng at canonical.com
Mon Jul 26 13:15:08 UTC 2021

From: Yang Yingliang <yangyingliang at huawei.com>

BugLink: https://bugs.launchpad.net/bugs/1934809

Add the missing unlock before return from function amd_pmc_send_cmd()
in the error handling case.

Fixes: 95e1b60f8dc8 ("platform/x86: amd-pmc: Fix command completion code")
Reported-by: Hulk Robot <hulkci at huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang at huawei.com>
Link: https://lore.kernel.org/r/20210715074327.1966083-1-yangyingliang@huawei.com
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
(cherry picked from commit 95edbbf78c3bdbd1daa921dd4a2e61c751e469ba linux-next)
Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
 drivers/platform/x86/amd-pmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
index 680f94c7e075b..663a4ca0580d2 100644
--- a/drivers/platform/x86/amd-pmc.c
+++ b/drivers/platform/x86/amd-pmc.c
@@ -275,7 +275,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg
 	if (rc) {
 		dev_err(dev->dev, "failed to talk to SMU\n");
-		return rc;
+		goto out_unlock;
 	/* Write zero to response register */

More information about the kernel-team mailing list