[PATCH] synclink.c driver init modifications

* Fix cleanup on driver init failure (call pci_unregister_driver if
  necessary)

* Keep driver loaded if no hardware found (for dynid support)

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 9463f585fc06a7fbbc02f9fde534e000949d094c..55bea6b2e503d7417289036748e7fd996e4ecbe1 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -1,7 +1,7 @@
 /*
  * linux/drivers/char/synclink.c
  *
- * $Id: synclink.c,v 4.21 2004/03/08 15:29:22 paulkf Exp $
+ * $Id: synclink.c,v 4.24 2004/06/03 14:50:09 paulkf Exp $
  *
  * Device driver for Microgate SyncLink ISA and PCI
  * high speed multiprotocol serial adapters.
@@ -782,7 +782,6 @@ int mgsl_claim_resources(struct mgsl_struct *info);
 void mgsl_release_resources(struct mgsl_struct *info);
 void mgsl_add_device(struct mgsl_struct *info);
 struct mgsl_struct* mgsl_allocate_device(void);
-int mgsl_enum_isa_devices(void);
 
 /*
  * DMA buffer manupulation functions.
@@ -866,6 +865,9 @@ static int mgsl_loopmode_send_done( struct mgsl_struct * info );
 
 #define jiffies_from_ms(a) ((((a) * HZ)/1000)+1)
 
+/* set non-zero on successful registration with PCI subsystem */
+static int pci_registered;
+
 /*
  * Global linked list of SyncLink devices
  */
@@ -909,7 +911,7 @@ MODULE_PARM(txdmabufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i");
 MODULE_PARM(txholdbufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i");
 
 static char *driver_name = "SyncLink serial driver";
-static char *driver_version = "$Revision: 4.21 $";
+static char *driver_version = "$Revision: 4.24 $";
 
 static int synclink_init_one (struct pci_dev *dev,
                                     const struct pci_device_id *ent);
@@ -4487,9 +4489,11 @@ static struct tty_operations mgsl_ops = {
 /*
  * perform tty device initialization
  */
-int mgsl_init_tty(void)
+static int mgsl_init_tty(void)
 {
-       serial_driver = alloc_tty_driver(mgsl_device_count);
+       int rc;
+
+       serial_driver = alloc_tty_driver(128);
        if (!serial_driver)
                return -ENOMEM;
        
@@ -4505,9 +4509,13 @@ int mgsl_init_tty(void)
                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
        serial_driver->flags = TTY_DRIVER_REAL_RAW;
        tty_set_operations(serial_driver, &mgsl_ops);
-       if (tty_register_driver(serial_driver) < 0)
+       if ((rc = tty_register_driver(serial_driver)) < 0) {
                printk("%s(%d):Couldn't register serial driver\n",
                        __FILE__,__LINE__);
+               put_tty_driver(serial_driver);
+               serial_driver = NULL;
+               return rc;
+       }
                        
        printk("%s %s, tty major#%d\n",
                driver_name, driver_version,
@@ -4517,7 +4525,7 @@ int mgsl_init_tty(void)
 
 /* enumerate user specified ISA adapters
  */
-int mgsl_enum_isa_devices(void)
+static int mgsl_enum_isa_devices(void)
 {
        struct mgsl_struct *info;
        int i;
@@ -4548,51 +4556,9 @@ int mgsl_enum_isa_devices(void)
                
                mgsl_add_device( info );
        }
-       
-       return 0;
 }
 
-/* mgsl_init()
- * 
- *     Driver initialization entry point.
- *     
- * Arguments:  None
- * Return Value:       0 if success, otherwise error code
- */
-int __init mgsl_init(void)
-{
-       int rc;
-
-       printk("%s %s\n", driver_name, driver_version);
-       
-       mgsl_enum_isa_devices();
-       pci_register_driver(&synclink_pci_driver);
-
-       if ( !mgsl_device_list ) {
-               printk("%s(%d):No SyncLink devices found.\n",__FILE__,__LINE__);
-               return -ENODEV;
-       }
-       if ((rc = mgsl_init_tty()))
-               return rc;
-       
-       return 0;
-}
-
-static int __init synclink_init(void)
-{
-/* Uncomment this to kernel debug module.
- * mgsl_get_text_ptr() leaves the .text address in eax
- * which can be used with add-symbol-file with gdb.
- */
-       if (break_on_load) {
-               mgsl_get_text_ptr();
-               BREAKPOINT();
-       }
-       
-       return mgsl_init();
-}
-
-static void __exit synclink_exit(void) 
+static void synclink_cleanup(void)
 {
        int rc;
        struct mgsl_struct *info;
@@ -4600,11 +4566,13 @@ static void __exit synclink_exit(void)
 
        printk("Unloading %s: %s\n", driver_name, driver_version);
 
-       if ((rc = tty_unregister_driver(serial_driver)))
-               printk("%s(%d) failed to unregister tty driver err=%d\n",
-                      __FILE__,__LINE__,rc);
+       if (serial_driver) {
+               if ((rc = tty_unregister_driver(serial_driver)))
+                       printk("%s(%d) failed to unregister tty driver err=%d\n",
+                              __FILE__,__LINE__,rc);
+               put_tty_driver(serial_driver);
+       }
 
-       put_tty_driver(serial_driver);
        info = mgsl_device_list;
        while(info) {
 #ifdef CONFIG_SYNCLINK_SYNCPPP
@@ -4622,7 +4590,40 @@ static void __exit synclink_exit(void)
                tmp_buf = NULL;
        }
        
-       pci_unregister_driver(&synclink_pci_driver);
+       if (pci_registered)
+               pci_unregister_driver(&synclink_pci_driver);
+}
+
+static int __init synclink_init(void)
+{
+       int rc;
+
+       if (break_on_load) {
+               mgsl_get_text_ptr();
+               BREAKPOINT();
+       }
+
+       printk("%s %s\n", driver_name, driver_version);
+
+       mgsl_enum_isa_devices();
+       if ((rc = pci_register_driver(&synclink_pci_driver)) < 0)
+               printk("%s:failed to register PCI driver, error=%d\n",__FILE__,rc);
+       else
+               pci_registered = 1;
+
+       if ((rc = mgsl_init_tty()) < 0)
+               goto error;
+
+       return 0;
+
+error:
+       synclink_cleanup();
+       return rc;
+}
+
+static void __exit synclink_exit(void)
+{
+       synclink_cleanup();
 }
 
 module_init(synclink_init);