From 513ef8448b7a9e469e1186f944439e216b60af66 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed, 30 Apr 2008 00:53:23 -0700
Subject: [PATCH] --- yaml --- r: 95167 b: refs/heads/master c:
 f433c65b8acb5346e6fefff4e4b97711c987ccf9 h: refs/heads/master i:   95165:
 c0dfbb618cea0431ba6da69704b6f0522cc5a2d7   95163:
 6f4396a80c643378a4d0cbd8726036c6ecedf2be   95159:
 7770274cb3c2c0cb36a229bd27feef0d4e3dadc0   95151:
 7dedeb5664d65d945bc4971236c131fafe54e172   95135:
 3c51f926516f3e4d2930c9d7c67390f802d05a61   95103:
 160846eac1f86c9cdc2c362b7112cb7fd26f7aab v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/char/stallion.c | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index b1432ea60ba2..2ab630261564 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b190e178f63e8dad7755054e02dc18a24ea6f0ac
+refs/heads/master: f433c65b8acb5346e6fefff4e4b97711c987ccf9
diff --git a/trunk/drivers/char/stallion.c b/trunk/drivers/char/stallion.c
index 874aaa08e956..983244ab1362 100644
--- a/trunk/drivers/char/stallion.c
+++ b/trunk/drivers/char/stallion.c
@@ -1273,18 +1273,9 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
 
 	rc = 0;
 
+	lock_kernel();
+
 	switch (cmd) {
-	case TIOCGSOFTCAR:
-		rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0),
-			(unsigned __user *) argp);
-		break;
-	case TIOCSSOFTCAR:
-		if (get_user(ival, (unsigned int __user *) arg))
-			return -EFAULT;
-		tty->termios->c_cflag =
-				(tty->termios->c_cflag & ~CLOCAL) |
-				(ival ? CLOCAL : 0);
-		break;
 	case TIOCGSERIAL:
 		rc = stl_getserial(portp, argp);
 		break;
@@ -1308,7 +1299,7 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
 		rc = -ENOIOCTLCMD;
 		break;
 	}
-
+	unlock_kernel();
 	return rc;
 }