Very Computer

Fix arbitration between net open and tty open.

Cleanup unused local resulting from latest tty changes.

Please apply.

--

Microgate Corporation, http://www.microgate.com

--- linux-2.5.72/drivers/char/synclink.c        2003-06-16 08:42:25.000000000 -0500

 /*
  * linux/drivers/char/synclink.c
  *
- * $Id: synclink.c,v 4.9 2003/05/06 21:18:51 paulkf Exp $
+ * $Id: synclink.c,v 4.12 2003/06/18 15:29:32 paulkf Exp $
  *
  * Device driver for Microgate SyncLink ISA and PCI

 MODULE_PARM(txholdbufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i");

 static char *driver_name = "SyncLink serial driver";
-static char *driver_version = "$Revision: 4.9 $";
+static char *driver_version = "$Revision: 4.12 $";

 static int synclink_init_one (struct pci_dev *dev,

 {
        struct mgsl_struct * info = (struct mgsl_struct *)tty->driver_data;

-       if (!info || mgsl_paranoia_check(info, tty->name, "mgsl_close"))
+       if (mgsl_paranoia_check(info, tty->name, "mgsl_close"))
                return;

        if (debug_level >= DEBUG_LEVEL_INFO)
                printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
                         __FILE__,__LINE__, info->device_name, info->count);

-       if (!info->count || tty_hung_up_p(filp))
+       if (!info->count)
+               return;
+
+       if (tty_hung_up_p(filp))
                goto cleanup;

        info = mgsl_device_list;
        while(info && info->line != line)
                info = info->next_device;
-       if ( !info ){
-               printk("%s(%d):Can't find specified device on open (line=%d)\n",
-                       __FILE__,__LINE__,line);
+       if (mgsl_paranoia_check(info, tty->name, "mgsl_open"))
                return -ENODEV;
-       }

        tty->driver_data = info;
        info->tty = tty;
-       if (mgsl_paranoia_check(info, tty->name, "mgsl_open"))
-               return -ENODEV;

        if (debug_level >= DEBUG_LEVEL_INFO)

 cleanup:                      
        if (retval) {
+               if (tty->count == 1)
+                       info->tty = 0; /* tty layer will release tty struct */
                if(info->count)
                        info->count--;

 int mgsl_init_tty(void);
 int mgsl_init_tty()
 {
-       struct mgsl_struct *info;
        serial_driver = alloc_tty_driver(mgsl_device_count);
        if (!serial_driver)
                return -ENOMEM;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/