|
@@ -1343,7 +1343,7 @@ static inline void serial_omap_add_console_port(struct uart_omap_port *up)
|
|
|
|
|
|
/* Enable or disable the rs485 support */
|
|
/* Enable or disable the rs485 support */
|
|
static int
|
|
static int
|
|
-serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
|
|
|
|
|
|
+serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485)
|
|
{
|
|
{
|
|
struct uart_omap_port *up = to_uart_omap_port(port);
|
|
struct uart_omap_port *up = to_uart_omap_port(port);
|
|
unsigned int mode;
|
|
unsigned int mode;
|
|
@@ -1356,8 +1356,12 @@ serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
|
|
up->ier = 0;
|
|
up->ier = 0;
|
|
serial_out(up, UART_IER, 0);
|
|
serial_out(up, UART_IER, 0);
|
|
|
|
|
|
|
|
+ /* Clamp the delays to [0, 100ms] */
|
|
|
|
+ rs485->delay_rts_before_send = min(rs485->delay_rts_before_send, 100U);
|
|
|
|
+ rs485->delay_rts_after_send = min(rs485->delay_rts_after_send, 100U);
|
|
|
|
+
|
|
/* store new config */
|
|
/* store new config */
|
|
- port->rs485 = *rs485conf;
|
|
|
|
|
|
+ port->rs485 = *rs485;
|
|
|
|
|
|
/*
|
|
/*
|
|
* Just as a precaution, only allow rs485
|
|
* Just as a precaution, only allow rs485
|