Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1971750ybh; Tue, 14 Jul 2020 12:00:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRBxt9tg5SAhtRjbmkmk4jdFlCKaxa/r07L9YIW0w+TlB2V2l+7IPDzsWlG+PeRCoYiwqM X-Received: by 2002:a05:6402:1d0b:: with SMTP id dg11mr5808221edb.212.1594753201474; Tue, 14 Jul 2020 12:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753201; cv=none; d=google.com; s=arc-20160816; b=g+VXSnqSietPpuy+yLzzApMdpWwMOUAhUKmtfZKlD+3+QA5dkiJcEo1u9wKQpnfBMj k0PxjKN+9cix8aGi6L2w+7HOsvH20qAqvpW4i6j82vDR48WajEQxprf4tYCtHbsG0HKI jajop0/OerrmprcYXwwD1naBnMM5xshLEho/OnuSZtfXcIB3nEXgdgfbAQpmCs4dDvBE 7xeoFtTOwIiHmPEb8kF3fnr62tsXN4cpL+vSicsnv0EW9kJQm8yagqH4f0Fo+Yrk34a1 pwHzmy7TPUcG7RvtoDkj+7M1XHBTR9bP0TvcRrm4f4SQwjkB4QkvCVEVr09l8X+UH4Px 8a+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Aima2jlo7adKuthXP9ACDyzBUSuGEuNi41w4d8N8b84=; b=U/Sc+Z2NnImaNq5Cpbywy578LOwrKO0sIxgKoQK5DG8mQlOt1VO96NIYAhQupjVIay 7xEOsxD8BeyeADv8czGKrjWcLQJ73kwD50/6WqMTQq5+Oc8Pvj9SHgro1Jpst6smTLNj fEa9f2FN3U45g0BC6/m2tRMzN4hx/qA1A23HYy0n73YPQeHmpYA9+1T0mQ0+1tHR/7mv /cAora1ynE+P3JPekIi2AJ8eShtZcQgVQ3YvlnAKOxNh++i2HmAes6trS3OjVEqYf+31 RCxKQwx1gKvQeD9Z8Aw0EzCF/Cz/RHMg/2138Nl2BFoHnD3FKAXQIUtErOWV/i1lF/OR qpig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E870+L8W; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g22si13165280edj.310.2020.07.14.11.59.38; Tue, 14 Jul 2020 12:00:01 -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=@kernel.org header.s=default header.b=E870+L8W; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731008AbgGNS4i (ORCPT + 99 others); Tue, 14 Jul 2020 14:56:38 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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