projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tty-next into 3.6-rc1
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
class
/
cdc-acm.c
diff --git
a/drivers/usb/class/cdc-acm.c
b/drivers/usb/class/cdc-acm.c
index 56d6bf66848894b76564ba452e00d6cf37f13416..18f4e62aaa75863b817d94842caf99f00fa2b069 100644
(file)
--- a/
drivers/usb/class/cdc-acm.c
+++ b/
drivers/usb/class/cdc-acm.c
@@
-826,7
+826,7
@@
static void acm_tty_set_termios(struct tty_struct *tty,
struct ktermios *termios_old)
{
struct acm *acm = tty->driver_data;
- struct ktermios *termios = tty->termios;
+ struct ktermios *termios =
&
tty->termios;
struct usb_cdc_line_coding newline;
int newctrl = acm->ctrlout;