Merge tag 'usb-serial-4.6-rc1' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/johan/usb-serial into usb-next Johan writes: USB-serial updates for v4.6-rc1 Here are some cp210x register-accessor updates and general usb-serial code clean ups. Signed-off-by: Johan Hovold <johan@kernel.org>
mariux64 · Mar 9, 2016 · ce53bfc · ce53bfc
2 parents a567500 + 7084fa8
commit ce53bfc
Show file tree

Hide file tree

Showing 12 changed files with 228 additions and 178 deletions.
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
@@ -370,7 +370,7 @@ static void ch341_set_termios(struct tty_struct *tty,
 static void ch341_break_ctl(struct tty_struct *tty, int break_state)
 {
 	const uint16_t ch341_break_reg =
-		CH341_REG_BREAK1 | ((uint16_t) CH341_REG_BREAK2 << 8);
+			((uint16_t) CH341_REG_BREAK2 << 8) | CH341_REG_BREAK1;
 	struct usb_serial_port *port = tty->driver_data;
 	int r;
 	uint16_t reg_contents;