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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 37C0FC433EB for ; Tue, 14 Jul 2020 18:50:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10A5B22B3F for ; Tue, 14 Jul 2020 18:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752636; bh=Ptx4lwXhCmZB7hb4xyroUfIKSsS43kLVDvqBrOxrLYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HCgxpFsD7HW9DI29aKuECKUnwzbykIFXdUAlmSvPtwpPv42VTkLOm3PI6mphzvIfL C4n0Abx75PMMJhKE37ggANHjFHGxrVwRXXqVNck4y4tZ3nZN8pS2++NJVYJPn3zeuS KowHobtMbSYzxVE8qEn/dPru+jkIUK9T7YcK0f4w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729661AbgGNSuf (ORCPT ); Tue, 14 Jul 2020 14:50:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:46720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729603AbgGNSud (ORCPT ); Tue, 14 Jul 2020 14:50:33 -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 D6AD3207F5; Tue, 14 Jul 2020 18:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752633; bh=Ptx4lwXhCmZB7hb4xyroUfIKSsS43kLVDvqBrOxrLYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsvY6as4zC992SJX7bH6vTEFHH1EZvAbnrem01MSry9jVKbRCv/0h+mhtTrcz954o OwsEIgy7b4kRnfjOueeHCcb6loS0n9Yjr8hMGpKjMoSp7u1PpUMT82JTAqtaBk7Af/ d8Qw7BjX4KzJJh8vSvc3F5/Ibdvp+8jc+qi6cLBU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 053/109] net: hns3: add a missing uninit debugfs when unload driver Date: Tue, 14 Jul 2020 20:43:56 +0200 Message-Id: <20200714184108.057006787@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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 From: Huazhong Tan [ Upstream commit e22b5e728bbb179b912d3a3cd5c25894a89a26a2 ] When unloading driver, if flag HNS3_NIC_STATE_INITED has been already cleared, the debugfs will not be uninitialized, so fix it. Fixes: b2292360bb2a ("net: hns3: Add debugfs framework registration") Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 403e0f089f2af..37537c3020806 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3993,9 +3993,8 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) hns3_put_ring_config(priv); - hns3_dbg_uninit(handle); - out_netdev_free: + hns3_dbg_uninit(handle); free_netdev(netdev); } -- 2.25.1