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 B74E6C4167D for ; Mon, 6 Nov 2023 13:22:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232439AbjKFNW1 (ORCPT ); Mon, 6 Nov 2023 08:22:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232441AbjKFNW0 (ORCPT ); Mon, 6 Nov 2023 08:22:26 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C50C8A9 for ; Mon, 6 Nov 2023 05:22:23 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11C0DC433C7; Mon, 6 Nov 2023 13:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699276943; bh=SQScx7tVo3fmEkfL8VxjyBgWVJh/hxcuTB0wWM7R3FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EEaUZjOf4w9dD1lYcLmm+jgEqNu/+pUSlDiesp30m2veL60vQS5wGNQMQRFkIs0x7 +q1KDDWWKPv+NfrHVwiAo2LLdhlvquXRZopgw8sulfcAGbN/WzwZvmzt7qsgSnSHBg 0QT5x7K51UWj+jJF0n6tOl4rzy85L7ZH7tLlnkGw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tomas Henzl , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.4 60/74] scsi: mpt3sas: Fix in error path Date: Mon, 6 Nov 2023 14:04:20 +0100 Message-ID: <20231106130303.776362936@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106130301.687882731@linuxfoundation.org> References: <20231106130301.687882731@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 044a00edb5459..4731e464dfb95 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -11138,8 +11138,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