Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95167
b: refs/heads/master
c: f433c65
h: refs/heads/master
i:
  95165: c0dfbb6
  95163: 6f4396a
  95159: 7770274
  95151: 7dedeb5
  95135: 3c51f92
  95103: 160846e
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent 28b2443 commit 513ef84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b190e178f63e8dad7755054e02dc18a24ea6f0ac
refs/heads/master: f433c65b8acb5346e6fefff4e4b97711c987ccf9
15 changes: 3 additions & 12 deletions trunk/drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 513ef84

Please sign in to comment.