diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /drivers/net/usb | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/usb')
| -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 c8570b097880..39422f71e1d0 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); |