diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /drivers/net/usb/hso.c | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/usb/hso.c')
| -rw-r--r-- | drivers/net/usb/hso.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 0a3c41faea9c..4dd23513c5af 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
| @@ -1334,7 +1334,6 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp) | |||
| 1334 | /* check for port already opened, if not set the termios */ | 1334 | /* check for port already opened, if not set the termios */ |
| 1335 | serial->open_count++; | 1335 | serial->open_count++; |
| 1336 | if (serial->open_count == 1) { | 1336 | if (serial->open_count == 1) { |
| 1337 | tty->low_latency = 1; | ||
| 1338 | serial->rx_state = RX_IDLE; | 1337 | serial->rx_state = RX_IDLE; |
| 1339 | /* Force default termio settings */ | 1338 | /* Force default termio settings */ |
| 1340 | _hso_serial_set_termios(tty, NULL); | 1339 | _hso_serial_set_termios(tty, NULL); |