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 BE1ED211A34; Thu, 12 Dec 2024 16:01:45 +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=1734019305; cv=none; b=dnvZ8vNwVQJb+qXLZm6pRzEKBofOTaxi53ac0hQ326lFdcLAaipJPbn1aDJDLcqYOJ62IeObSbZvJfNKWTQkM7btFxj+7vOhFhKlf57z6AEAKcup8XVhau4uV1DGGcIsYbgBKJ/UdNF4FXK1jHx7TKPpo3gdjwCOsGZHDz1MmX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019305; c=relaxed/simple; bh=WfyF7MhcqZ1JjPhHQMiS4TSnwfstXMSLRkVqK35cceo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AjOjI1gaC07RJqDDuNKpfgSOl+oen1sB7wn/XLXmCur97l+WJv6pbiBLO9/62u5Z53McdB45uMBDNv9u/j5/Wdj7sBeBXzy234/Wtv7So1gTegzt8DpVqRrzagDgJqIVICL6MbYDNLXLlT43a9T+1KjvvF/dkNJo3vyERJcx+pg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aNK72gRi; 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="aNK72gRi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B2DCC4CED0; Thu, 12 Dec 2024 16:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019305; bh=WfyF7MhcqZ1JjPhHQMiS4TSnwfstXMSLRkVqK35cceo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aNK72gRi00Pi3TYebOeW7g5HJuVvKJuwaSaTryjo1+M7irUMWE6qv9OU6z0SNe6e8 kjlIxn+LP+PTvQXbfjhaxt5ZJv7Ma1uugEttJKHDWzkMZHr+gTc9c0emucets/g61/ gWoKoUoyyb/pje2TL55dVcF9DIAomzDAZ4eQX6N0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Can , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= , Kalle Valo , Sasha Levin Subject: [PATCH 6.1 173/772] wifi: wfx: Fix error handling in wfx_core_init() Date: Thu, 12 Dec 2024 15:51:58 +0100 Message-ID: <20241212144357.096857630@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Can [ Upstream commit 3b88a9876779b55478a4dde867e73f7a100ffa23 ] The wfx_core_init() returns without checking the retval from sdio_register_driver(). If the sdio_register_driver() failed, the module failed to install, leaving the wfx_spi_driver not unregistered. Fixes: a7a91ca5a23d ("staging: wfx: add infrastructure for new driver") Signed-off-by: Yuan Can Reviewed-by: Jérôme Pouiller Signed-off-by: Kalle Valo Link: https://patch.msgid.link/20241022090453.84679-1-yuancan@huawei.com Signed-off-by: Sasha Levin --- drivers/net/wireless/silabs/wfx/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/silabs/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c index 84d82ddded567..2a3dc7d961edc 100644 --- a/drivers/net/wireless/silabs/wfx/main.c +++ b/drivers/net/wireless/silabs/wfx/main.c @@ -479,10 +479,23 @@ static int __init wfx_core_init(void) { int ret = 0; - if (IS_ENABLED(CONFIG_SPI)) + if (IS_ENABLED(CONFIG_SPI)) { ret = spi_register_driver(&wfx_spi_driver); - if (IS_ENABLED(CONFIG_MMC) && !ret) + if (ret) + goto out; + } + if (IS_ENABLED(CONFIG_MMC)) { ret = sdio_register_driver(&wfx_sdio_driver); + if (ret) + goto unregister_spi; + } + + return 0; + +unregister_spi: + if (IS_ENABLED(CONFIG_SPI)) + spi_unregister_driver(&wfx_spi_driver); +out: return ret; } module_init(wfx_core_init); -- 2.43.0