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

Commit 34b76fca authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cp210x: fix up set_termios variables 



[Based on a patch from Johan, mangled by gregkh to keep things in line]

Fix up the variable usage in the set_termios call.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Cc: Preston Fick <preston.fick@silabs.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7f482fc8

drivers/usb/serial/cp210x.c

+3 −2
Original line number Diff line number Diff line
@@ -580,7 +580,8 @@ static void cp210x_set_termios(struct tty_struct *tty, 
		struct usb_serial_port *port, struct ktermios *old_termios)

{

	unsigned int cflag, old_cflag;

	unsigned int baud = 0, bits;

	u32 baud;

	unsigned int bits;

	unsigned int modem_ctl[4];



	dbg("%s - port %d", __func__, port->number);
@@ -596,7 +597,7 @@ static void cp210x_set_termios(struct tty_struct *tty, 
	if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {

		dbg("%s - Setting baud rate to %d baud", __func__,

				baud);

		if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, 4)) {

		if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, sizeof(baud))) {

			dbg("Baud rate requested not supported by device");

			baud = tty_termios_baud_rate(old_termios);

		}