Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e9fc313 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Tested-by: default avatarOyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e46a5e3f

drivers/char/moxa.c

+2 −2
Original line number Diff line number Diff line
@@ -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) |