---

yaml --- r: 230695 b: refs/heads/master c: 5dfbd1d h: refs/heads/master i: 230693: 03551bb 230691: b8533c9 230687: c5f6ec4 v: v3
git-mirror · Jan 14, 2011 · 21a61bc · 21a61bc
1 parent 62eeb69
commit 21a61bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c9ae009b298753a3baf71298d676a68b5a10c8f
+refs/heads/master: 5dfbd1d734ef5415bc47b034df7433ba21e40e7b
diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/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: