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 77A5B1509BD; Wed, 5 Feb 2025 13:59:30 +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=1738763970; cv=none; b=oj/LfWh48/Tkuw2b6QLd/mjqWscN4MdHq/dX65KlhzcCmrC6xAnmCPAKUJCFoZbYFyjsHJDOOAkn0YbdCRmRLPjkkGZgyk63EV15mYv01ZOiYkVdism6FS/hYxCU8of7yenHra/9XsJBLko+Shz6r3AM6vTV5uVWlOqq7T2bIFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738763970; c=relaxed/simple; bh=4KbNhygUBVU/0vABzfWgm9YCNfuDzmV3Hv4yAfLqEDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=acBvRP6YxCSJSx8oG2tUO3GwMyaj3NyMal1AGl47yyPTXRlH/rhmkRbrf/KJ3ga0rm3/8XWgaI8Vm1rLcKX/VaTzLNjmPSNUQzbZwE8jeOt3xknAPeQy5YycTGhU38cXzIbHgW/J2TjdZToJdEuHS7FoHkAZmbRFNBhs/VYN9kM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m4qZktVp; 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="m4qZktVp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F13BC4CED1; Wed, 5 Feb 2025 13:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738763970; bh=4KbNhygUBVU/0vABzfWgm9YCNfuDzmV3Hv4yAfLqEDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m4qZktVpKI+kSiOSYypjW8yoLYcEtEFoDtKWeg9MiyYgjrfwyJAsmk5ddOG414g/a Nlm0jR/I5uG3V8+cQNr6NTdR3yX6b7HnPx7dD2kjd4t98/qJeXnath0/w23gA2jzPh NeAwlE/AHPRFv4SYodMsw9hRLdny+JxBhVvjByVk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thadeu Lima de Souza Cascardo , Ping-Ke Shih , Sasha Levin Subject: [PATCH 6.12 077/590] wifi: rtlwifi: do not complete firmware loading needlessly Date: Wed, 5 Feb 2025 14:37:12 +0100 Message-ID: <20250205134458.200382171@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thadeu Lima de Souza Cascardo [ Upstream commit e73e11d303940119e41850a0452a0deda2cc4eb5 ] The only code waiting for completion is driver removal, which will not be called when probe returns a failure. So this completion is unnecessary. Fixes: b0302aba812b ("rtlwifi: Convert to asynchronous firmware load") Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20241107133322.855112-2-cascardo@igalia.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - drivers/net/wireless/realtek/rtlwifi/usb.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index 11709b6c83f1a..40fc3c297a8ac 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -2266,7 +2266,6 @@ int rtl_pci_probe(struct pci_dev *pdev, pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start); pci_release_regions(pdev); - complete(&rtlpriv->firmware_loading_complete); fail1: if (hw) diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c index d37a017b2b814..c3aa0cd9ff211 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -1040,7 +1040,6 @@ int rtl_usb_probe(struct usb_interface *intf, error_out2: _rtl_usb_io_handler_release(hw); usb_put_dev(udev); - complete(&rtlpriv->firmware_loading_complete); kfree(rtlpriv->usb_data); ieee80211_free_hw(hw); return -ENODEV; -- 2.39.5