Skip to content

Commit

Permalink
[SCSI] mpt fusion: deregister from transport layer if PCI registratio…
Browse files Browse the repository at this point in the history
…n failed

The mptspi and mptsas drivers are modified to deregister from transport layer
if registration with PCI driver failed

Signed-off-by: Sathya Prakash <sathya.prakash@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
Prakash, Sathya authored and James Bottomley committed Jul 18, 2007
1 parent 0c8db6b commit 57ce21b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion drivers/message/fusion/mptsas.c
Original file line number Diff line number Diff line change
Expand Up @@ -3301,6 +3301,8 @@ static struct pci_driver mptsas_driver = {
static int __init
mptsas_init(void)
{
int error;

show_mptmod_ver(my_NAME, my_VERSION);

mptsas_transport_template =
Expand All @@ -3324,7 +3326,11 @@ mptsas_init(void)
": Registered for IOC reset notifications\n"));
}

return pci_register_driver(&mptsas_driver);
error = pci_register_driver(&mptsas_driver);
if (error)
sas_release_transport(mptsas_transport_template);

return error;
}

static void __exit
Expand Down
8 changes: 7 additions & 1 deletion drivers/message/fusion/mptspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,8 @@ static struct pci_driver mptspi_driver = {
static int __init
mptspi_init(void)
{
int error;

show_mptmod_ver(my_NAME, my_VERSION);

mptspi_transport_template = spi_attach_transport(&mptspi_transport_functions);
Expand All @@ -1544,7 +1546,11 @@ mptspi_init(void)
": Registered for IOC reset notifications\n"));
}

return pci_register_driver(&mptspi_driver);
error = pci_register_driver(&mptspi_driver);
if (error)
spi_release_transport(mptspi_transport_template);

return error;
}

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
Expand Down

0 comments on commit 57ce21b

Please sign in to comment.