Skip to content

Commit

Permalink
Char: moxa, fix TIOC(G/S)SOFTCAR param
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Apr 30, 2008
1 parent e46a5e3 commit 9e9fc31
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/char/moxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,9 +741,9 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
MoxaPortSendBreak(ch->port, arg);
return (0);
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:
if(get_user(retval, (unsigned long __user *) argp))
if (get_user(retval, (int __user *)argp))
return -EFAULT;
arg = retval;
tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) |
Expand Down

0 comments on commit 9e9fc31

Please sign in to comment.