From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35158C35640 for ; Fri, 21 Feb 2020 08:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF467222C4 for ; Fri, 21 Feb 2020 08:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272154; bh=ySzhj8c70C8x5NMMk9F+nbbW1KMpZZRpt6qN/z686dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZtNAtjmS/zU7XfDNbxTWDwluL+nnY/2/kkIT6d+g7FQs4j9iUNVKRZeUujZ63vtqL SggdHR9yba+ZzHBsKGhgrCfdXsFlnkmL/Mpcr/1Y4aIqZ4DYmP5rJCy3AJG3A6v+/8 fBiMSnggwr7DMglQypk4naSeFMXJUlUXoDqJo5d0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731375AbgBUICc (ORCPT ); Fri, 21 Feb 2020 03:02:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:34994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730889AbgBUICb (ORCPT ); Fri, 21 Feb 2020 03:02:31 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E062A206ED; Fri, 21 Feb 2020 08:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272150; bh=ySzhj8c70C8x5NMMk9F+nbbW1KMpZZRpt6qN/z686dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9wNt8lml3gAak2cy8zrmgs2TzDzZ7+Q+jJnCZhb2Y6f553HOOTbwXN0Fk861raIj Hgu0Lujlvt+d2HUN8K7uEkabEPSqoXyMpD/xPWlHkNyTge6lq6pfyk1PdTwZl1zYby l1YkiOADW2udzzvHK1ja2fpWDbVcPRgtr8vZGsJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeffrey Hugo , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 008/344] ath10k: Fix qmi init error handling Date: Fri, 21 Feb 2020 08:36:47 +0100 Message-Id: <20200221072350.029861295@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072349.335551332@linuxfoundation.org> References: <20200221072349.335551332@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeffrey Hugo [ Upstream commit f8a595a87e93a33a10879f4b856be818d2f53c84 ] When ath10k_qmi_init() fails, the error handling does not free the irq resources, which causes an issue if we EPROBE_DEFER as we'll attempt to (re-)register irqs which are already registered. Fix this by doing a power off since we just powered on the hardware, and freeing the irqs as error handling. Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client") Signed-off-by: Jeffrey Hugo Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/snoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index fc15a0037f0e6..63607c3b8e818 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -1729,13 +1729,16 @@ static int ath10k_snoc_probe(struct platform_device *pdev) ret = ath10k_qmi_init(ar, msa_size); if (ret) { ath10k_warn(ar, "failed to register wlfw qmi client: %d\n", ret); - goto err_core_destroy; + goto err_power_off; } ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc probe\n"); return 0; +err_power_off: + ath10k_hw_power_off(ar); + err_free_irq: ath10k_snoc_free_irq(ar); -- 2.20.1