summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-03-04 12:39:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-07 05:44:14 +0300
commit2c3fbe3cf28fbd7001545a92a83b4f8acfd9fa36 (patch)
tree06a6ad05c835c15a36513ae9175e28eed7f71e2f /net/irda
parent647f162b8e7e446c4bade031eb8a1a0a83d3de82 (diff)
downloadlinux-2c3fbe3cf28fbd7001545a92a83b4f8acfd9fa36.tar.xz
net: irda: fix wait_until_sent poll timeout
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") Cc: stable <stable@vger.kernel.org> # v2.6.12 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/ircomm/ircomm_tty.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 40695b9751c1..4efe486baee6 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -798,7 +798,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) {