[SCSI] mpt fusion: deregister from transport layer if PCI registration 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>

2 files changed, 14 insertions, 2 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 030bb8389aee..d50664640512 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -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 =
@@ -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
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 4d2c98104aeb..947fe2901800 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -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);
@@ -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;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/