patch-2.3.32 linux/drivers/char/synclink.c
Next file: linux/drivers/i2o/i2o_block.c
Previous file: linux/drivers/char/msp3400.c
Back to the patch index
Back to the overall index
- Lines: 61
- Date:
Sun Dec 12 22:55:54 1999
- Orig file:
v2.3.31/linux/drivers/char/synclink.c
- Orig date:
Fri Oct 15 15:25:13 1999
diff -u --recursive --new-file v2.3.31/linux/drivers/char/synclink.c linux/drivers/char/synclink.c
@@ -1,7 +1,7 @@
/*
* linux/drivers/char/synclink.c
*
- * ==FILEDATE 19990901==
+ * ==FILEDATE 19991207==
*
* Device driver for Microgate SyncLink ISA and PCI
* high speed multiprotocol serial adapters.
@@ -925,7 +925,7 @@
#endif
static char *driver_name = "SyncLink serial driver";
-static char *driver_version = "1.14";
+static char *driver_version = "1.15";
static struct tty_driver serial_driver, callout_driver;
static int serial_refcount;
@@ -6981,7 +6981,6 @@
spin_lock_irqsave(&info->irq_spinlock,flags);
usc_reset(info);
- spin_unlock_irqrestore(&info->irq_spinlock,flags);
/* Verify the reset state of some registers. */
@@ -7015,7 +7014,6 @@
}
}
- spin_lock_irqsave(&info->irq_spinlock,flags);
usc_reset(info);
spin_unlock_irqrestore(&info->irq_spinlock,flags);
@@ -7035,7 +7033,6 @@
spin_lock_irqsave(&info->irq_spinlock,flags);
usc_reset(info);
- spin_unlock_irqrestore(&info->irq_spinlock,flags);
/*
* Setup 16C32 to interrupt on TxC pin (14MHz clock) transition.
@@ -7057,6 +7054,8 @@
usc_UnlatchIostatusBits(info, MISCSTATUS_TXC_LATCHED);
usc_EnableStatusIrqs(info, SICR_TXC_ACTIVE + SICR_TXC_INACTIVE);
+ spin_unlock_irqrestore(&info->irq_spinlock,flags);
+
EndTime=100;
while( EndTime-- && !info->irq_occurred ) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -7359,7 +7358,9 @@
}
}
+ spin_lock_irqsave(&info->irq_spinlock,flags);
usc_reset( info );
+ spin_unlock_irqrestore(&info->irq_spinlock,flags);
/* restore current port options */
memcpy(&info->params,&tmp_params,sizeof(MGSL_PARAMS));
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)