git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20180920' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
serial
/
ti_usb_3410_5052.c
diff --git
a/drivers/usb/serial/ti_usb_3410_5052.c
b/drivers/usb/serial/ti_usb_3410_5052.c
index 3010878f7f8ed9004bb78a15f63e1eb83261742e..e3c5832337e0bdbb83df78285a697ac5f5a8af3f 100644
(file)
--- a/
drivers/usb/serial/ti_usb_3410_5052.c
+++ b/
drivers/usb/serial/ti_usb_3410_5052.c
@@
-1119,7
+1119,7
@@
static void ti_break(struct tty_struct *tty, int break_state)
static int ti_get_port_from_code(unsigned char code)
{
- return (code >>
4) - 3
;
+ return (code >>
6) & 0x01
;
}
static int ti_get_func_from_code(unsigned char code)