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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 2A51FC0650F for ; Thu, 8 Aug 2019 19:06:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB66A21874 for ; Thu, 8 Aug 2019 19:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565291180; bh=g/tPa+jt+TvuRNuOou3zOSMr9LJkys2p6bHg72AjxpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kZiuaLhUymjsPBEaPLkNwZ4sIv+1mbNgU2SyYlxRgWZsXctkeyqO9MxJr3l56vVAx +IFP6Y0G+5ehrDKWLPn4pYBkFQNLys3sczXuy8BklU409Z77V4JjBLAR5A/4IPkgyZ AU8utIkDTsr+W/oUQDBVlHfaCECue7BhBWZ0gaWY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404367AbfHHTGT (ORCPT ); Thu, 8 Aug 2019 15:06:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:39606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403901AbfHHTGO (ORCPT ); Thu, 8 Aug 2019 15:06:14 -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 E4B372184E; Thu, 8 Aug 2019 19:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565291174; bh=g/tPa+jt+TvuRNuOou3zOSMr9LJkys2p6bHg72AjxpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NoCNAk+Jk/YVCoir8IojAUM66jEVlB7Aje2YxRwt3WK217onZFra8zL7W0C8N+8wR Z/ufv4+aLOtz76GH1zBck/mVTJgDh9DVL/K2dTechiVmtn2bh9PEUlyJJZNnoPP/4C uuq08DRDDF+iVBTVncset2mOgKXaa31veSLaNuRQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Pirko , Ido Schimmel , "David S. Miller" Subject: [PATCH 5.2 15/56] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Date: Thu, 8 Aug 2019 21:04:41 +0200 Message-Id: <20190808190453.468265897@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190808190452.867062037@linuxfoundation.org> References: <20190808190452.867062037@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: Jiri Pirko [ Upstream commit 28fe79000e9b0a6f99959869947f1ca305f14599 ] In case of sp2 pci driver registration fail, fix the error path to start with sp1 pci driver unregister. Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC") Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -5989,7 +5989,7 @@ static int __init mlxsw_sp_module_init(v return 0; err_sp2_pci_driver_register: - mlxsw_pci_driver_unregister(&mlxsw_sp2_pci_driver); + mlxsw_pci_driver_unregister(&mlxsw_sp1_pci_driver); err_sp1_pci_driver_register: mlxsw_core_driver_unregister(&mlxsw_sp2_driver); err_sp2_core_driver_register: