Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b41ce99 authored by Sebastian Frias's avatar Sebastian Frias Committed by Greg Kroah-Hartman
Browse files

8250: use callbacks to access UART_DLL/UART_DLM 



Some UART HW has a single register combining UART_DLL/UART_DLM
(this was probably forgotten in the change that introduced the
callbacks, commit b32b19b8)

Fixes: b32b19b8 ("[SERIAL] 8250: set divisor register correctly ...")

Signed-off-by: default avatarSebastian Frias <sf84@laposte.net>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aaa68c50

drivers/tty/serial/8250/8250_port.c

+6 −12
Original line number Diff line number Diff line
@@ -813,22 +813,16 @@ static int size_fifo(struct uart_8250_port *up) 
 */

static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)

{

	unsigned char old_dll, old_dlm, old_lcr;

	unsigned int id;

	unsigned char old_lcr;

	unsigned int id, old_dl;



	old_lcr = serial_in(p, UART_LCR);

	serial_out(p, UART_LCR, UART_LCR_CONF_MODE_A);

	old_dl = serial_dl_read(p);

	serial_dl_write(p, 0);

	id = serial_dl_read(p);

	serial_dl_write(p, old_dl);



	old_dll = serial_in(p, UART_DLL);

	old_dlm = serial_in(p, UART_DLM);



	serial_out(p, UART_DLL, 0);

	serial_out(p, UART_DLM, 0);



	id = serial_in(p, UART_DLL) | serial_in(p, UART_DLM) << 8;



	serial_out(p, UART_DLL, old_dll);

	serial_out(p, UART_DLM, old_dlm);

	serial_out(p, UART_LCR, old_lcr);



	return id;