git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: irda: fix wait_until_sent poll timeout
[pandora-kernel.git]
/
net
/
irda
/
ircomm
/
ircomm_tty.c
diff --git
a/net/irda/ircomm/ircomm_tty.c
b/net/irda/ircomm/ircomm_tty.c
index
253695d
..
cf368dd
100644
(file)
--- a/
net/irda/ircomm/ircomm_tty.c
+++ b/
net/irda/ircomm/ircomm_tty.c
@@
-848,7
+848,9
@@
static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)
orig_jiffies = jiffies;
/* Set poll time to 200 ms */
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) {
spin_lock_irqsave(&self->spinlock, flags);
while (self->tx_skb && self->tx_skb->len) {