diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
| commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch) | |
| tree | a196404c795091aae4254c9d479dce1c0653e4c5 /drivers/serial | |
| parent | 1989425a3aed215f1accd5d8019b18b345166a63 (diff) | |
| parent | f1d23ed8218ca5afaf178a6495253dbb7fc98f57 (diff) | |
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, | |||
| 3724 | return e100_enable_rs485(tty, &rs485data); | 3724 | return e100_enable_rs485(tty, &rs485data); |
| 3725 | } | 3725 | } |
| 3726 | 3726 | ||
| 3727 | case TIOCGRS485: | ||
| 3728 | { | ||
| 3729 | struct serial_rs485 *rs485data = | ||
| 3730 | &(((struct e100_serial *)tty->driver_data)->rs485); | ||
| 3731 | /* This is the ioctl to get RS485 data from user-space */ | ||
| 3732 | if (copy_to_user((struct serial_rs485 *) arg, | ||
| 3733 | rs485data, | ||
| 3734 | sizeof(serial_rs485))) | ||
| 3735 | return -EFAULT; | ||
| 3736 | break; | ||
| 3737 | } | ||
| 3727 | 3738 | ||
| 3728 | case TIOCSERWRRS485: | 3739 | case TIOCSERWRRS485: |
| 3729 | { | 3740 | { |