Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c3fbe3c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: 1da177e4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>	# v2.6.12
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 647f162b

net/irda/ircomm/ircomm_tty.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {