git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
atmel_serial.c
diff --git
a/drivers/tty/serial/atmel_serial.c
b/drivers/tty/serial/atmel_serial.c
index
3892666
..
2a1d52f
100644
(file)
--- a/
drivers/tty/serial/atmel_serial.c
+++ b/
drivers/tty/serial/atmel_serial.c
@@
-1732,6
+1732,11
@@
static int __devinit atmel_serial_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1);
platform_set_drvdata(pdev, port);
+ if (port->rs485.flags & SER_RS485_ENABLED) {
+ UART_PUT_MR(&port->uart, ATMEL_US_USMODE_NORMAL);
+ UART_PUT_CR(&port->uart, ATMEL_US_RTSEN);
+ }
+
return 0;
err_add_port: