lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'rs485fix' of git://www.jni.nu/cris

Browse Source 
* 'rs485fix' of git://www.jni.nu/cris:
  CRIS: ioctl for getting RS485 information
This commit is contained in:
Linus Torvalds
2010-08-09 21:04:23 -07:00
parent 1989425a3a f1d23ed821
commit 7fbd15f9b4
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/serial/crisv10.c
View File

@ -3724,6 +3724,17 @@ rs_ioctl(struct tty_struct *tty, struct file * file,
return e100_enable_rs485(tty, &rs485data);
}
case TIOCGRS485:
{
struct serial_rs485 *rs485data =
&(((struct e100_serial *)tty->driver_data)->rs485);
/* This is the ioctl to get RS485 data from user-space */
if (copy_to_user((struct serial_rs485 *) arg,
rs485data,
sizeof(serial_rs485)))
return -EFAULT;
break;
}
case TIOCSERWRRS485:
{