serial: omap: fix rs485 probe on defered pinctrl

If the gpio is not yet available we better also defer the probing in the rs485 case. Signed-off-by: Michael Grzeschik <[email protected]> Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
jdobaj · Feb 13, 2014 · a64c1a1 · a64c1a1
1 parent 13b949f
commit a64c1a1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
@@ -1601,8 +1601,11 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
 					    flags & SER_RS485_RTS_AFTER_SEND);
 		if (ret < 0)
 			return ret;
-	} else
+	} else if (up->rts_gpio == -EPROBE_DEFER) {
+		return -EPROBE_DEFER;
+	} else {
 		up->rts_gpio = -EINVAL;
+	}
 
 	if (of_property_read_u32_array(np, "rs485-rts-delay",
 				    rs485_delay, 2) == 0) {