diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 21:04:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 21:04:23 -0700 |
| commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch) | |
| tree | a196404c795091aae4254c9d479dce1c0653e4c5 /drivers/serial | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | CRIS: ioctl for getting RS485 information (diff) | |
| download | linux-dev-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.tar.xz linux-dev-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.zip | |
Merge branch 'rs485fix' of git://www.jni.nu/cris
* 'rs485fix' of git://www.jni.nu/cris:
CRIS: ioctl for getting RS485 information
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/crisv10.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 31f172397af3..30626440a062 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -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: { |