Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4688651pxj; Wed, 12 May 2021 10:56:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG1LSL1Z31665PLvTHQzqf+z7h9FhtmZvL7N1EfifDgWnBe5gD67hN+hr9DSa9NiR4wCeT X-Received: by 2002:a4a:d543:: with SMTP id q3mr28706190oos.72.1620842172943; Wed, 12 May 2021 10:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620842172; cv=none; d=google.com; s=arc-20160816; b=G/JHFwE7pLtGDEfxVaCa35S19hI5PO8lqbozkQMPlP/hpA8N40+9JiF9e+JsZQM5qn wo98AUElFShHyrzbVUywRJ9FsC58ZvscrOWh9RG4aRTwKAWn3lIm5WcBVhYIAlX0TrSS q+xrlAy+wX9QEeYyF4MliGDgSNLeO9DZ0xELE2K4Y1ZaKCnjr63vQma6O+sawPAsyHow g7slGnsDK/BbD+vXkYe3BRtK0ESkmJORPx6CsVS0AYPVrMU8yydJ17tSfTYTt8zGXKoh Sgr5q1/K6xfFKN+c03AnjppJqcWWsapHNMqdAYLEaqpDw/oAcQzUAAcBe6hZKLRSrL7i gZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=r9BZ3MiDQ/HGYrEq0dqJK/UGA7fUdpdiLS8rcn/0F0c=; b=ecoPDMTVlMjM+QEWme51IQdRSHt+w1zrX5ROGXl6nJDvCCIsW9h9XsZyBgO/zVIoMO ZQZsRj64sTXgapVvtvaGptJ53vIKnGM7ELQqL5QVbJMXeHeZwdfJrdgViWIYIO6hUMIa 9d3cymUtTPC+lSvdm5glwuo+DfX/UnzcYOjxzY3VM3weLDE4IT8peeQPE3QH6j+M37Bn XEbO3GmUdrxeDj8QqGI1Q2sfd9P5U+Ax3JOAwJHnZmhutZw+G2JhgJmHeX4vTkQTA+rE YjB7Qxx/rmppl0O+sDWP5aPtNxNWexT6teSl+Z9nng/gG3ZR3db+Ne0cCXsrBMhekfGm DEVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="AOC8/Y48"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e3si453529otq.68.2021.05.12.10.55.59; Wed, 12 May 2021 10:56:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="AOC8/Y48"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350996AbhELRw6 (ORCPT + 99 others); Wed, 12 May 2021 13:52:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:36250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236768AbhELQW7 (ORCPT ); Wed, 12 May 2021 12:22:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1F0BF61C99; Wed, 12 May 2021 15:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834434; bh=2WEbULl4E6y4kgvGnmH5aRV4YDyBR8EYJfX2VktV0gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AOC8/Y48qP+oY6E1PoGIKXLdRIr5bXmfx53xvrgs90Zn8+bajXk4nV+Occl755l8B GC09eoOE08qXrCOor+E2zG3S5vNJzHz4zioJ/kQamPi/AfrcWPqhB2La82cMM94XHk p1My4+Ow73UvqAHkgwNwN4bQCGqRgEcSkVY5nzdw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryder Lee , Felix Fietkau , Sasha Levin Subject: [PATCH 5.11 542/601] mt76: mt7615: fix memleak when mt7615_unregister_device() Date: Wed, 12 May 2021 16:50:19 +0200 Message-Id: <20210512144845.708652109@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ryder Lee [ Upstream commit 8ab31da7b89f71c4c2defcca989fab7b42f87d71 ] mt7615_tx_token_put() should get call before mt76_free_pending_txwi(). Fixes: a6275e934605 ("mt76: mt7615: reset token when mac_reset happens") Signed-off-by: Ryder Lee Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c index 58a0ec1bf8d7..5dd1c6d501ad 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c @@ -168,10 +168,9 @@ void mt7615_unregister_device(struct mt7615_dev *dev) mt76_unregister_device(&dev->mt76); if (mcu_running) mt7615_mcu_exit(dev); - mt7615_dma_cleanup(dev); mt7615_tx_token_put(dev); - + mt7615_dma_cleanup(dev); tasklet_disable(&dev->irq_tasklet); mt76_free_device(&dev->mt76); -- 2.30.2