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 3DDF21A315E; Wed, 19 Feb 2025 09:06:58 +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=1739956018; cv=none; b=ZTIGAzdfOMSe+VeITjB2TWV3Cfle9e15iuZBunI3vHT2wAESnVbq1EhZC25/K4wc/fSo2Td4cxXB5EzihmUSN3SvvNK2NTtQiumpRYS/JnLnRew1ssItSF8RpS9iRQV1+NqEKtsJSiHaz8evzbmmFQTKB6vFNXd5x6OtKtGuYJI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739956018; c=relaxed/simple; bh=rIfRSw1PrWH3YBu2PLf3HHV6XGQTND682fdAy9ciHX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dKBz4vNQgjvNPLerGg+0vjTsAqdcPT7v4IjqOxTQTI+Qao63W088Wo+EsZD7qkH2TID+K1vrEVxXAwVmQUzSLGx2YA587GTfe1n1BKxwgGlWfgvkHbE7J/6EqiMnkMdsRRzQaRIUYMY0RshSOPAqDIjJOkMscK6u2Us95WRqtiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h4fYfC0E; 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="h4fYfC0E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B89EEC4CED1; Wed, 19 Feb 2025 09:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956018; bh=rIfRSw1PrWH3YBu2PLf3HHV6XGQTND682fdAy9ciHX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h4fYfC0ENsJ/7OXP2oUtQjrX7ZsHf8ryCZWYKKwslOAwLyv47H8iMhKE6wvUS3try Q1l2h9Xw2xYsZlAqbzygK7QYFbUS2uzNS+K8OvyvYtp8hvh2kfU5E/vgznfkX0zQOn 52mmO2Vj2PBiDadR0/TRIFgEWRZl8c6FHKv0USWY= 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.1 036/578] wifi: rtlwifi: do not complete firmware loading needlessly Date: Wed, 19 Feb 2025 09:20:40 +0100 Message-ID: <20250219082654.316217948@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: 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 6116c1bec1558..1707d00b49698 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -2273,7 +2273,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 a8eebafb9a7ee..c2a3c88ea1fcc 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -1085,7 +1085,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