summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Henzl <thenzl@redhat.com>2023-10-15 13:45:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-08 11:22:20 +0100
commit0af1e2367ec86ba3aa37587394b3f620cecb5f57 (patch)
tree26361b937b13acf6b2df386edd16716959bdea82
parentcb60292dae932d47bc4e51c58bdd84e2cde22663 (diff)
downloadlinux-0af1e2367ec86ba3aa37587394b3f620cecb5f57.tar.gz
linux-0af1e2367ec86ba3aa37587394b3f620cecb5f57.tar.bz2
linux-0af1e2367ec86ba3aa37587394b3f620cecb5f57.zip
scsi: mpt3sas: Fix in error path
[ Upstream commit e40c04ade0e2f3916b78211d747317843b11ce10 ] The driver should be deregistered as misc driver after PCI registration failure. Signed-off-by: Tomas Henzl <thenzl@redhat.com> Link: https://lore.kernel.org/r/20231015114529.10725-1-thenzl@redhat.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_scsih.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c8d97dc2ca63..bf659bc466dc 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -11182,8 +11182,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;
}