Merge branch 'master' into for-next

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index c856905bb3bd..bcc31f2140ac 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -18,7 +18,6 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
@@ -1411,11 +1410,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 +3234,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 +3694,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 +3736,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 +4532,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