Very Computer

Fix arbitration between net open and tty open.

Cleanup missed bits of CUA device removal changes.

Please apply.

--

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

--- linux-2.5.72/drivers/char/pcmcia/synclink_cs.c      2003-06-16 08:42:24.000000000 -0500

 /*
  * linux/drivers/char/pcmcia/synclink_cs.c
  *
- * $Id: synclink_cs.c,v 4.10 2003/05/13 16:06:03 paulkf Exp $
+ * $Id: synclink_cs.c,v 4.13 2003/06/18 15:29:32 paulkf Exp $
  *
  * Device driver for Microgate SyncLink PC Card

  * assigned major number. May be forced as module parameter.
  */
 static int ttymajor=0;
-static int cuamajor=0;

 static int debug_level = 0;

 MODULE_PARM(break_on_load,"i");
 MODULE_PARM(ttymajor,"i");
-MODULE_PARM(cuamajor,"i");
 MODULE_PARM(debug_level,"i");
 MODULE_PARM(maxframe,"1-" __MODULE_STRING(MAX_DEVICE_COUNT) "i");

 MODULE_LICENSE("GPL");

 static char *driver_name = "SyncLink PC Card driver";
-static char *driver_version = "$Revision: 4.10 $";
+static char *driver_version = "$Revision: 4.13 $";

 static struct tty_driver *serial_driver;

                               (info->serial_signals & SerialSignal_DCD) ? "on" : "off");
                if (info->serial_signals & SerialSignal_DCD)
                        wake_up_interruptible(&info->open_wait);
-               else if (!(info->flags & ASYNC_CALLOUT_NOHUP)) {
+               else {
                        if (debug_level >= DEBUG_LEVEL_ISR)
                                printk("doing serial hangup...");

 {
        MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;

-       if (!info || mgslpc_paranoia_check(info, tty->name, "mgslpc_close"))
+       if (mgslpc_paranoia_check(info, tty->name, "mgslpc_close"))
                return;

        if (debug_level >= DEBUG_LEVEL_INFO)
                printk("%s(%d):mgslpc_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 = mgslpc_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 (mgslpc_paranoia_check(info, tty->name, "mgslpc_open"))
                return -ENODEV;
-       }

        tty->driver_data = info;
        info->tty = tty;
-       if (mgslpc_paranoia_check(info, tty->name, "mgslpc_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--;
        }

--

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

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

-
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/