diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-04-30 09:53:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 17:29:42 +0200 |
| commit | 9e9fc313ffa3cb92f7f81a8e076566bc9d582351 (patch) | |
| tree | 3bd92db9d6486357a3e3e0246c54290aef44cbc8 /drivers | |
| parent | Char: moxa, pci io space fixup (diff) | |
| download | linux-9e9fc313ffa3cb92f7f81a8e076566bc9d582351.tar.xz linux-9e9fc313ffa3cb92f7f81a8e076566bc9d582351.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/moxa.c | 4 |
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, 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) | |