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,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 C6CC3C433EC for ; Tue, 14 Jul 2020 19:04:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95A4222AAF for ; Tue, 14 Jul 2020 19:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753444; bh=q48lzcsda5IIe9qnR2s7M5wcre/hEwczDqOY/2h///Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Aml0P4rTlL5jD53+BLsUdhE66N61LAkD6kTnvK7xsPKkoL78Yxij0fVge1M290UKT WMxqxNspGJZ8eb1aLEG7OSYq4IczbVI8mYehKnugLWBxKIxDSzg6v/rZJXSAvQH/b5 IxHSIKijxhacM1AJzGeUmZ/tqJQUcYg0v+Ule/0M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731002AbgGNS4h (ORCPT ); Tue, 14 Jul 2020 14:56:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730368AbgGNS4g (ORCPT ); Tue, 14 Jul 2020 14:56:36 -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 74E7122B2B; Tue, 14 Jul 2020 18:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752996; bh=q48lzcsda5IIe9qnR2s7M5wcre/hEwczDqOY/2h///Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E870+L8WwygmajrwoeTXyp0w1JkCBkPB0PQUvf+IwbK4NJwYfjTZUQ9GLLLGpYBj5 y3wAXqIrLP8sppmPVQda+F50LU9QVYOrzrDfFfxehFHdLL+hurAuwpsqVfBBAcLsQJ veuGcc7BjlJtHS1s2yURM6mwuVU+/55uTfdf3d5A= 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.7 079/166] net: hns3: add a missing uninit debugfs when unload driver Date: Tue, 14 Jul 2020 20:44:04 +0200 Message-Id: <20200714184119.633369313@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@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 da98fd7c8eca5..3003eecd5263b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -4153,9 +4153,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