diff --git a/[refs] b/[refs] index 97e0c1a046f0..1c25cc09514e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6be06e7273c4682a15ca1f4adf1aeae510823530 +refs/heads/master: b1622e0ac1b18632cff1e9af807fcdcb2397071b diff --git a/trunk/drivers/tty/serial/jsm/jsm_tty.c b/trunk/drivers/tty/serial/jsm/jsm_tty.c index 00f250ae14c5..27bb75070c96 100644 --- a/trunk/drivers/tty/serial/jsm/jsm_tty.c +++ b/trunk/drivers/tty/serial/jsm/jsm_tty.c @@ -596,12 +596,6 @@ void jsm_input(struct jsm_channel *ch) jsm_dbg(READ, &ch->ch_bd->pci_dev, "start 2\n"); - if (data_len <= 0) { - spin_unlock_irqrestore(&ch->ch_lock, lock_flags); - jsm_dbg(READ, &ch->ch_bd->pci_dev, "jsm_input 1\n"); - return; - } - len = tty_buffer_request_room(port, data_len); n = len;