Commit a64c1a1c authored Feb 13, 2014 by Michael Grzeschik Committed by Greg Kroah-Hartman Feb 13, 2014

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 <m.grzeschik@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 13b949f0

drivers/tty/serial/omap-serial.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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) {