From 0014897dc46808fab7a00b98916166cb191b2f76 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 30 Apr 2008 00:53:38 -0700 Subject: [PATCH] --- yaml --- r: 95186 b: refs/heads/master c: 9e9fc313ffa3cb92f7f81a8e076566bc9d582351 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/moxa.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 302f242ec134..f6eace857aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e46a5e3ff06b70690d567bdc81faf6c1c32e742f +refs/heads/master: 9e9fc313ffa3cb92f7f81a8e076566bc9d582351 diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c index f841b1f74bfc..428c1380b771 100644 --- a/trunk/drivers/char/moxa.c +++ b/trunk/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) |