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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53867C4167B for ; Sun, 29 Oct 2023 23:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbjJ2X3P (ORCPT ); Sun, 29 Oct 2023 19:29:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232611AbjJ2X2v (ORCPT ); Sun, 29 Oct 2023 19:28:51 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DD6347B0; Sun, 29 Oct 2023 16:00:06 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 829C0C116B4; Sun, 29 Oct 2023 22:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620306; bh=AK3/KWW6IdZiNY+dybojAjdFYzaUPkBLykaEQO5UqLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KHHnJABnZVHKCh4yoUQtY1g9WqZpCpkHN32oF5+SkXofHbPIUpwEZOOnQJvniT8Uh m8Z/AN9NJZvdYF90Gp+psGbHlyj2Oi/HpNym4i5XtBRj9P/Xor5tZy0k95FhcJ+Eqv 0SHv0MBV6zHj6GH5fJlP+wJN2qt/PeslRZBETl+DzKgIXDnDQfByRAdWUYWwUn/mrl +miXk/Sbat7deLKUIJxJFenqr10nPRWZvfHlmNO9C8cvnqS+YaWczvl2NQnCD92xqW 6YRcdJUGMl8Lq+p5Uf755c+2j/UNi9q9zQxs7Adze8ZRaQnxv5SDTL/rU3vo6/zc1O WtUznJyEljXIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tomas Henzl , "Martin K . Petersen" , Sasha Levin , sathya.prakash@broadcom.com, sreekanth.reddy@broadcom.com, suganath-prabu.subramani@broadcom.com, jejb@linux.ibm.com, MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 27/39] scsi: mpt3sas: Fix in error path Date: Sun, 29 Oct 2023 18:56:59 -0400 Message-ID: <20231029225740.790936-27-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225740.790936-1-sashal@kernel.org> References: <20231029225740.790936-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.60 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Tomas Henzl [ Upstream commit e40c04ade0e2f3916b78211d747317843b11ce10 ] The driver should be deregistered as misc driver after PCI registration failure. Signed-off-by: Tomas Henzl Link: https://lore.kernel.org/r/20231015114529.10725-1-thenzl@redhat.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 8e24ebcebfe52..2ea3bdc638177 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -12914,8 +12914,10 @@ _mpt3sas_init(void) mpt3sas_ctl_init(hbas_to_enumerate); error = pci_register_driver(&mpt3sas_driver); - if (error) + if (error) { + mpt3sas_ctl_exit(hbas_to_enumerate); scsih_exit(); + } return error; } -- 2.42.0