lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Char: moxa, fix TIOC(G/S)SOFTCAR param

Browse Source 
according to ioctl_list, both have int * as a param, not ulong *.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
2008-04-30 00:53:38 -07:00
committed by Linus Torvalds
parent e46a5e3ff0
commit 9e9fc313ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/moxa.c
View File

@@ -741,9 +741,9 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
MoxaPortSendBreak(ch->port, arg); MoxaPortSendBreak(ch->port, arg);
return (0); return (0);
case TIOCGSOFTCAR: case TIOCGSOFTCAR:
return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp); return put_user(C_CLOCAL(tty) ? 1 : 0, (int __user *)argp);
case TIOCSSOFTCAR: case TIOCSSOFTCAR:
if(get_user(retval, (unsigned long __user *) argp)) if (get_user(retval, (int __user *)argp))
return -EFAULT; return -EFAULT;
arg = retval; arg = retval;
tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) |