From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 623392288E9; Thu, 12 Dec 2024 15:57:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019026; cv=none; b=k3GM41ZCa4jxHmKhlYuAYd/OmwiQinB3IXl1s6+DPnVY5Mx1+GSHQ9MgSH8Em9Somfervw5ubJifNNJEPcurf8NLNMIbXnpN8aehH3VrHD/ogsg7sjdee0QtegnMAMmhbNVkyxMuQkXQzl0MWfiMu6BV1JtrZBlmU6fJQmoD+iY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019026; c=relaxed/simple; bh=m37KOQUR8lvayd2yHqiqm3cD/KyTPuPLXhBeuCft5VE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N5pAzgjis0sZRXjxAJp02N0MRUQLiSl423twfm3Rmg+SXPMrii9GLB9EVtJrupvPqelgHWvKwUc1R0j67slvfBcQaNu2nTsuVkMD5WDu3t1fppFc1iplbR0yW5gzYCnlfMulYwO2LMaWgyKAj9IAaoBxozSiSo1R32GrZlnXfIE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nbuqPFVd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nbuqPFVd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EA52C4CED3; Thu, 12 Dec 2024 15:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019026; bh=m37KOQUR8lvayd2yHqiqm3cD/KyTPuPLXhBeuCft5VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbuqPFVdU/kcBStZtyJohmPzFPa/xq/1HhKEPBK81jwILVyxTmT82/cyfShbpASRX 55PAB7WDSz0wtVYOBjsqYfszdev8L4qgFFo0A4ztdl7GjwXm0rd+2cZk1i0dEA9Q3e douwgRjh4fvRbnHUUI1gYYPd0X5o1waM5/f9e3Bw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Can , Brian Norris , Tzung-Bi Shih , Sasha Levin Subject: [PATCH 6.1 068/772] firmware: google: Unregister driver_info on failure Date: Thu, 12 Dec 2024 15:50:13 +0100 Message-ID: <20241212144352.747407583@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Can [ Upstream commit 32b0901e141f6d4cf49d820b53eb09b88b1f72f7 ] When platform_device_register_full() returns error, the gsmi_init() returns without unregister gsmi_driver_info, fix by add missing platform_driver_unregister() when platform_device_register_full() failed. Fixes: 8942b2d5094b ("gsmi: Add GSMI commands to log S0ix info") Signed-off-by: Yuan Can Acked-by: Brian Norris Link: https://lore.kernel.org/r/20241015131344.20272-1-yuancan@huawei.com Signed-off-by: Tzung-Bi Shih Signed-off-by: Sasha Levin --- drivers/firmware/google/gsmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index 871bedf533a80..8c75308b01d5d 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -918,7 +918,8 @@ static __init int gsmi_init(void) gsmi_dev.pdev = platform_device_register_full(&gsmi_dev_info); if (IS_ERR(gsmi_dev.pdev)) { printk(KERN_ERR "gsmi: unable to register platform device\n"); - return PTR_ERR(gsmi_dev.pdev); + ret = PTR_ERR(gsmi_dev.pdev); + goto out_unregister; } /* SMI access needs to be serialized */ @@ -1056,10 +1057,11 @@ static __init int gsmi_init(void) gsmi_buf_free(gsmi_dev.name_buf); kmem_cache_destroy(gsmi_dev.mem_pool); platform_device_unregister(gsmi_dev.pdev); - pr_info("gsmi: failed to load: %d\n", ret); +out_unregister: #ifdef CONFIG_PM platform_driver_unregister(&gsmi_driver_info); #endif + pr_info("gsmi: failed to load: %d\n", ret); return ret; } -- 2.43.0