diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
| commit | b3b2b6351a3f3342e6669b5c2defc85f6af75ee3 (patch) | |
| tree | 9b47ae7b0111ab024d719214d2745b128db48beb | |
| parent | 90ae83f7fc32733e5829d806306c0c590f1a383f (diff) | |
| parent | 395bc5121828e570bd4bb6455c82b80e2f2b05b4 (diff) | |
| download | op-kernel-dev-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.zip op-kernel-dev-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.tar.gz | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: Add paths for CRISv10 serial driver
CRIS: Fix RS485 delay handling.
Add missing "struct" to in sizeof.
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/serial/crisv10.c | 23 |
2 files changed, 16 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb8b580..0094224 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1757,6 +1757,7 @@ L: linux-cris-kernel@axis.com W: http://developer.axis.com S: Maintained F: arch/cris/ +F: drivers/serial/crisv10.* CRYPTO API M: Herbert Xu <herbert@gondor.apana.org.au> diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index c856905..fa62578 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -1411,11 +1411,12 @@ e100_enable_rs485(struct tty_struct *tty, struct serial_rs485 *r) CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1); #endif - info->rs485.flags = r->flags; - if (r->delay_rts_before_send >= 1000) + info->rs485 = *r; + + /* Maximum delay before RTS equal to 1000 */ + if (info->rs485.delay_rts_before_send >= 1000) info->rs485.delay_rts_before_send = 1000; - else - info->rs485.delay_rts_before_send = r->delay_rts_before_send; + /* printk("rts: on send = %i, after = %i, enabled = %i", info->rs485.rts_on_send, info->rs485.rts_after_sent, @@ -3234,9 +3235,9 @@ rs_write(struct tty_struct *tty, e100_disable_rx(info); e100_enable_rx_irq(info); #endif - - if (info->rs485.delay_rts_before_send > 0) - msleep(info->rs485.delay_rts_before_send); + if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) && + (info->rs485.delay_rts_before_send > 0)) + msleep(info->rs485.delay_rts_before_send); } #endif /* CONFIG_ETRAX_RS485 */ @@ -3694,6 +3695,11 @@ rs_ioctl(struct tty_struct *tty, struct file * file, rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send; rs485data.flags = 0; + if (rs485data.delay_rts_before_send != 0) + rs485data.flags |= SER_RS485_RTS_BEFORE_SEND; + else + rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND); + if (rs485ctrl.enabled) rs485data.flags |= SER_RS485_ENABLED; else @@ -3731,7 +3737,7 @@ rs_ioctl(struct tty_struct *tty, struct file * file, /* This is the ioctl to get RS485 data from user-space */ if (copy_to_user((struct serial_rs485 *) arg, rs485data, - sizeof(serial_rs485))) + sizeof(struct serial_rs485))) return -EFAULT; break; } @@ -4527,6 +4533,7 @@ static int __init rs_init(void) /* Set sane defaults */ info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND); info->rs485.flags |= SER_RS485_RTS_AFTER_SEND; + info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND); info->rs485.delay_rts_before_send = 0; info->rs485.flags &= ~(SER_RS485_ENABLED); #endif |
