|
@@ -36,7 +36,7 @@
|
|
|
#include <linux/ctype.h>
|
|
|
#include <linux/tty.h>
|
|
|
#include <linux/tty_flip.h>
|
|
|
-#include <linux/smp_lock.h>
|
|
|
+#include <linux/slab.h>
|
|
|
#include <linux/ioport.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/uaccess.h>
|
|
@@ -2105,7 +2105,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
break;
|
|
|
case DIGI_SETAW:
|
|
|
case DIGI_SETAF:
|
|
|
- lock_kernel();
|
|
|
if (cmd == DIGI_SETAW) {
|
|
|
/* Setup an event to indicate when the transmit
|
|
|
buffer empties */
|
|
@@ -2118,7 +2117,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
|
|
|
if (tty->ldisc->ops->flush_buffer)
|
|
|
tty->ldisc->ops->flush_buffer(tty);
|
|
|
}
|
|
|
- unlock_kernel();
|
|
|
/* Fall Thru */
|
|
|
case DIGI_SETA:
|
|
|
if (copy_from_user(&ch->digiext, argp, sizeof(digi_t)))
|