aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-04-30 03:53:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:42 -0400
commit9e9fc313ffa3cb92f7f81a8e076566bc9d582351 (patch)
tree3bd92db9d6486357a3e3e0246c54290aef44cbc8
parente46a5e3ff06b70690d567bdc81faf6c1c32e742f (diff)
Char: moxa, fix TIOC(G/S)SOFTCAR param
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>
-rw-r--r--drivers/char/moxa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index f841b1f74bfc..428c1380b771 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -741,9 +741,9 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
741 MoxaPortSendBreak(ch->port, arg); 741 MoxaPortSendBreak(ch->port, arg);
742 return (0); 742 return (0);
743 case TIOCGSOFTCAR: 743 case TIOCGSOFTCAR:
744 return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp); 744 return put_user(C_CLOCAL(tty) ? 1 : 0, (int __user *)argp);
745 case TIOCSSOFTCAR: 745 case TIOCSSOFTCAR:
746 if(get_user(retval, (unsigned long __user *) argp)) 746 if (get_user(retval, (int __user *)argp))
747 return -EFAULT; 747 return -EFAULT;
748 arg = retval; 748 arg = retval;
749 tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | 749 tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) |