lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

timbuart: Fix the termios logic

Browse Source 
The driver only handles speeds but it fails to return the current values
for the hardware features it does not support.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox
2009-06-11 14:27:13 +01:00
committed by Linus Torvalds
parent 34aec59184
commit 7d55deaf50
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/serial/timbuart.c
View File

@@ -278,7 +278,7 @@ static int get_bindex(int baud)
int i; int i;
for (i = 0; i < ARRAY_SIZE(baudrates); i++) for (i = 0; i < ARRAY_SIZE(baudrates); i++)
if (baud == baudrates[i]) if (baud <= baudrates[i])
return i; return i;
return -1; return -1;
@@ -296,15 +296,21 @@ static void timbuart_set_termios(struct uart_port *port,
bindex = get_bindex(baud); bindex = get_bindex(baud);
dev_dbg(port->dev, "%s - bindex %d\n", __func__, bindex); dev_dbg(port->dev, "%s - bindex %d\n", __func__, bindex);
if (bindex < 0) { if (bindex < 0)
printk(KERN_ALERT "timbuart: Unsupported baud rate\n"); bindex = 0;
} else { baud = baudrates[bindex];
/* The serial layer calls into this once with old = NULL when setting
up initially */
if (old)
tty_termios_copy_hw(termios, old);
tty_termios_encode_baud_rate(termios, baud, baud);
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
iowrite8((u8)bindex, port->membase + TIMBUART_BAUDRATE); iowrite8((u8)bindex, port->membase + TIMBUART_BAUDRATE);
uart_update_timeout(port, termios->c_cflag, baud); uart_update_timeout(port, termios->c_cflag, baud);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
}
static const char *timbuart_type(struct uart_port *port) static const char *timbuart_type(struct uart_port *port)
{ {