aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250/8250_fintek.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/serial/8250/8250_fintek.c')
-rw-r--r--drivers/tty/serial/8250/8250_fintek.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tty/serial/8250/8250_fintek.c b/drivers/tty/serial/8250/8250_fintek.c
index 1bb28cb69493..1e6899bc9429 100644
--- a/drivers/tty/serial/8250/8250_fintek.c
+++ b/drivers/tty/serial/8250/8250_fintek.c
@@ -89,11 +89,11 @@ static int fintek_8250_check_id(void)
89 return 0; 89 return 0;
90} 90}
91 91
92static int fintek_8250_rs4850_config(struct uart_8250_port *uart, 92static int fintek_8250_rs485_config(struct uart_port *port,
93 struct serial_rs485 *rs485) 93 struct serial_rs485 *rs485)
94{ 94{
95 uint8_t config = 0; 95 uint8_t config = 0;
96 int index = fintek_8250_get_index(uart->port.iobase); 96 int index = fintek_8250_get_index(port->iobase);
97 97
98 if (index < 0) 98 if (index < 0)
99 return -EINVAL; 99 return -EINVAL;
@@ -134,6 +134,8 @@ static int fintek_8250_rs4850_config(struct uart_8250_port *uart,
134 outb(config, DATA_PORT); 134 outb(config, DATA_PORT);
135 fintek_8250_exit_key(); 135 fintek_8250_exit_key();
136 136
137 port->rs485 = *rs485;
138
137 return 0; 139 return 0;
138} 140}
139 141
@@ -166,7 +168,7 @@ fintek_8250_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
166 uart.port.irq = pnp_irq(dev, 0); 168 uart.port.irq = pnp_irq(dev, 0);
167 uart.port.iobase = pnp_port_start(dev, 0); 169 uart.port.iobase = pnp_port_start(dev, 0);
168 uart.port.iotype = UPIO_PORT; 170 uart.port.iotype = UPIO_PORT;
169 uart.rs485_config = fintek_8250_rs4850_config; 171 uart.port.rs485_config = fintek_8250_rs485_config;
170 172
171 uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF; 173 uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
172 if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE) 174 if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)