hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Grzeschik 2014-02-13 10:52:03 +01:00 committed by Greg Kroah-Hartman
parent 13b949f03e
commit a64c1a1c75
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/omap-serial.c
View File

@ -1601,8 +1601,11 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
flags & SER_RS485_RTS_AFTER_SEND); flags & SER_RS485_RTS_AFTER_SEND);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else } else if (up->rts_gpio == -EPROBE_DEFER) {
return -EPROBE_DEFER;
} else {
up->rts_gpio = -EINVAL; up->rts_gpio = -EINVAL;
}
if (of_property_read_u32_array(np, "rs485-rts-delay", if (of_property_read_u32_array(np, "rs485-rts-delay",
rs485_delay, 2) == 0) { rs485_delay, 2) == 0) {