From 8b447920d897b3572d21776d7bdedf08e2ec9f76 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 7 Mar 2013 13:12:25 +0100 Subject: [PATCH] --- yaml --- r: 364223 b: refs/heads/master c: b1622e0ac1b18632cff1e9af807fcdcb2397071b h: refs/heads/master i: 364221: 64d0bfb1a88c517f18ce2a5e27dccc5de202db12 364219: a3e520cb25a4606f97aca2aa695d096dcb341c95 364215: 5a0be972042c0c996bcab88cef0b60c1bde1efcd 364207: 909aadfc68d4da6511aa98720ff5b0a329534c1c 364191: 2b8827cf5f1e6615c8debfcd1e55613e73f30cac 364159: 83ca425297435a54384e5c1baf7df1d3c293e499 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/jsm/jsm_tty.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) 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;