Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4752288pxj; Wed, 12 May 2021 12:25:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVxyZIRkIWmbvUzTDmSFzNoPo9Sc0Zsdu7+02WIoeZRb9lsuRKTBYvGHVcYvnPw0eNwNA1 X-Received: by 2002:a17:907:1b1e:: with SMTP id mp30mr39213373ejc.532.1620847516413; Wed, 12 May 2021 12:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847516; cv=none; d=google.com; s=arc-20160816; b=Nf87M01pyRrVcmSWBF4kobpqiTqg0WbSGGo0MFIrZ55qCjaGkaqNK+Ay7rtp9oss5l dDJUoqaoIVgetuzuL31b/Ei9U+WzRI+dWVkqp2UlHLst1wuYDj4tX3lgGJLWUcF2cpID vlNHbrVEi8Lc/RgR+v1kPDK356n+WvtgnQqX4QTRMBiyNcFKRAYc9aozEl2XBnhhoHRR V66eBOlC52unl9tUwctB55kPHv6TjmUGANkhVz8ZQXqM9Gi34xxAMK6C/rE4emyNISJA Uv2D0m87chSFslSlFdqUjRpr94q0oRYtru4oJNwkiimoxDLGwPKReK67G01mJpwS2/cn XcqA== 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=LPNvhGFZjhqDYA8rss183vPowj+ftJ4Q4TlhanXoXcE=; b=vWGkGNbuMdv9AxX0HG5a3zBGrf6YWMZ3uyEq7YXBpkCWIcwZf1SucHJsfVwJNaO+gX fR0ww1o0TgDV7NytSpUIfiyT/aq2irBA7MhKeb945/7kW7WLJFT0eMhLCIzTeJZo+L7e jpaVzQhcq0+9Vn+98TsxAqUPz+qRpUaCGDtmxQx6TB6Y6LdBMHpu8nM5+/p/PFCiERbO 2zvHsX0W4ncCodOFpBU48TzIo3gsx6Yr9XFVlVUE1n1+tNxzAtD3Jeln3owcBa9gM/xp kzvepr1kTJWve3Erirrp8KwXGivKlWEeoK1XtO/hNtur8ORjD2p0ROHOGb6jMGX9VjGG JRNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=foSqLTgz; 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 o20si505565edr.268.2021.05.12.12.24.52; Wed, 12 May 2021 12:25:16 -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=foSqLTgz; 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 S1343846AbhELTYZ (ORCPT + 99 others); Wed, 12 May 2021 15:24:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:35814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244450AbhELQqP (ORCPT ); Wed, 12 May 2021 12:46:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A8A0D61E78; Wed, 12 May 2021 16:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620836101; bh=ijqnrvEXFkYjoGOgs//QWxqHJRbktpfHD1BB/ZsTikE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=foSqLTgzO/8rdyfwwDFJIGujvVvev2gON5oiC3g0OOycOE0IhcNDnFmRHgJiatnAY FDvTcKJGUNp3L6J3S/sWj9jqMUaOv+tfPUwwqPUsIY2XEqN9rMRZsxE6+UlLKgsWjV PLFLbWhARZDdA6KAnQIclKL0g+36IjoiwZE6ruDY= 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.12 611/677] mt76: mt7615: fix memleak when mt7615_unregister_device() Date: Wed, 12 May 2021 16:50:57 +0200 Message-Id: <20210512144857.666580942@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@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 72395925ddee..15b417d6d889 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c @@ -163,10 +163,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