diff options
| author | Johan Hovold <johan@kernel.org> | 2015-03-04 12:39:03 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 06:40:22 +0300 |
| commit | 974de0a75be69498648e831cb42c61cd9098e4de (patch) | |
| tree | f071c226e854c7f4b7ca19a4b5e4f341e82f0191 /net | |
| parent | 7ebae41be6d18aa63ea086f3522243d090a8fc8d (diff) | |
| download | linux-974de0a75be69498648e831cb42c61cd9098e4de.tar.xz | |
net: irda: fix wait_until_sent poll timeout
commit 2c3fbe3cf28fbd7001545a92a83b4f8acfd9fa36 upstream.
In case an infinite timeout (0) is requested, the irda wait_until_sent
implementation would use a zero poll timeout rather than the default
200ms.
Note that wait_until_sent is currently never called with a 0-timeout
argument due to a bug in tty_wait_until_sent.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 6b9d5a0e42f9..20fec0d90049 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -843,7 +843,9 @@ static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout) orig_jiffies = jiffies; /* Set poll time to 200 ms */ - poll_time = IRDA_MIN(timeout, msecs_to_jiffies(200)); + poll_time = msecs_to_jiffies(200); + if (timeout) + poll_time = min_t(unsigned long, timeout, poll_time); spin_lock_irqsave(&self->spinlock, flags); while (self->tx_skb && self->tx_skb->len) { |