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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 00F12C432BE for ; Tue, 10 Aug 2021 03:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6D9060F8F for ; Tue, 10 Aug 2021 03:59:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234670AbhHJEAP (ORCPT ); Tue, 10 Aug 2021 00:00:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:39212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbhHJEAC (ORCPT ); Tue, 10 Aug 2021 00:00:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BA72260FC4; Tue, 10 Aug 2021 03:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628567981; bh=vhxHO3WPgB5Ndk1MM87EutrORmfgaeC3y6wTcaPdHjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rgdkEp3DG5lQXlWZ+PZa+fmDyCkH6pi3a05104WlrmQxmrMPOOiauWKZIu6f4++Iq A/WbrMXnBTj90uxvsm0CN8/HkdhZw3AewqMgwX2eK4Ep9SwwYuraphXUzDKJmpUl3x ciPhAZMUvpT3j1Q5lpqWkdcO2FpjkT6gEqygc/6OdVPlC2lg9o7Be8IbyUJrdWLjFA fWL2XzJUBNsknbuZ8/caPuNqIm2ue1hFtiQjrrWPd6wamRKM3KrUreMRLceQNi61BE 5tzi6tXi3m05b3EaPJ4+E+tsVKUKkBFknQCigGgZipjnpwb2Tox3a+cqKNAw0gGjCG T88HiXFTuKfrg== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Leon Romanovsky , Tariq Toukan , Shay Drory , Parav Pandit , Saeed Mahameed Subject: [net 07/12] net/mlx5: Fix order of functions in mlx5_irq_detach_nb() Date: Mon, 9 Aug 2021 20:59:18 -0700 Message-Id: <20210810035923.345745-8-saeed@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210810035923.345745-1-saeed@kernel.org> References: <20210810035923.345745-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shay Drory Change order of functions in mlx5_irq_detach_nb() so it will be a mirror of mlx5_irq_attach_nb. Fixes: 71e084e26414 ("net/mlx5: Allocating a pool of MSI-X vectors for SFs") Signed-off-by: Shay Drory Reviewed-by: Parav Pandit Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index b25f764daa08..95e60da33f03 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -251,8 +251,11 @@ int mlx5_irq_attach_nb(struct mlx5_irq *irq, struct notifier_block *nb) int mlx5_irq_detach_nb(struct mlx5_irq *irq, struct notifier_block *nb) { + int err = 0; + + err = atomic_notifier_chain_unregister(&irq->nh, nb); irq_put(irq); - return atomic_notifier_chain_unregister(&irq->nh, nb); + return err; } struct cpumask *mlx5_irq_get_affinity_mask(struct mlx5_irq *irq) -- 2.31.1