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=-8.6 required=3.0 tests=DATE_IN_PAST_06_12, 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 5A88DC7618B for ; Thu, 25 Jul 2019 05:40:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 251D122BEF for ; Thu, 25 Jul 2019 05:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564033212; bh=3uSsuCn2bC+5Qh9r6pduaLyAIwG48pGXscbTNLwVHPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e5r75clpsMcEnUs6M1N4U71v3dHT+EXOCql7P1GrhwAZ0I4Egg+Mf45iHbPBHpJHS y18EtHuuZEsg4H5ECXznXSaXC4Sytal+YL3dRjWxSFfJaglKmgUk3ceSyhzF3YIlop v0A9/cJRoIiZoS+21IEIStAdxiipH7X4Hc+5uMKw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404299AbfGYFkL (ORCPT ); Thu, 25 Jul 2019 01:40:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:54624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404290AbfGYFkK (ORCPT ); Thu, 25 Jul 2019 01:40:10 -0400 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 B448122BEF; Thu, 25 Jul 2019 05:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564033210; bh=3uSsuCn2bC+5Qh9r6pduaLyAIwG48pGXscbTNLwVHPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izzzv+BdPzXAqrLFMwqBNt34YETviqYuqXSLIZcAUwvNLjSTUHpYVHLfJpcp6nnYv TWISXjIoBx33hTT0RL40lHco62hWOdY7dDoZpvkMq2KHq70Gh5hgVuC+PsVLxDQ/sl vajno1JoL8wbYYN9PKGqm71Yt5rJBfvDbRppe+AI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Gong , Kalle Valo , Sasha Levin Subject: [PATCH 4.19 131/271] ath10k: destroy sdio workqueue while remove sdio module Date: Wed, 24 Jul 2019 21:20:00 +0200 Message-Id: <20190724191706.461853085@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 3ed39f8e747a7aafeec07bb244f2c3a1bdca5730 ] The workqueue need to flush and destory while remove sdio module, otherwise it will have thread which is not destory after remove sdio modules. Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1. Signed-off-by: Wen Gong Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/sdio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index cb527a21f1ac..686759b5613f 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -2073,6 +2073,9 @@ static void ath10k_sdio_remove(struct sdio_func *func) cancel_work_sync(&ar_sdio->wr_async_work); ath10k_core_unregister(ar); ath10k_core_destroy(ar); + + flush_workqueue(ar_sdio->workqueue); + destroy_workqueue(ar_sdio->workqueue); } static const struct sdio_device_id ath10k_sdio_devices[] = { -- 2.20.1