lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IRDA]: stir4200 fixes.

Browse Source 
From: Olaf Hartmann <olaf.hartmann@s1998.tu-chemnitz.de>

The attached patch observes the stir4200 fifo size and will clear the
fifo, if the size is increasing, while it should be transmitting bytes

Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Olaf Hartmann
2007-12-16 14:09:44 -08:00
committed by David S. Miller
parent 2638698df3
commit ea332912b8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/irda/stir4200.c
View File

@@ -142,9 +142,6 @@ enum StirCtrl2Mask {
}; };
enum StirFifoCtlMask { enum StirFifoCtlMask {
FIFOCTL_EOF = 0x80,
FIFOCTL_UNDER = 0x40,
FIFOCTL_OVER = 0x20,
FIFOCTL_DIR = 0x10, FIFOCTL_DIR = 0x10,
FIFOCTL_CLR = 0x08, FIFOCTL_CLR = 0x08,
FIFOCTL_EMPTY = 0x04, FIFOCTL_EMPTY = 0x04,
@@ -594,9 +591,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
{ {
int err; int err;
unsigned long count, status; unsigned long count, status;
unsigned long prev_count = 0x1fff;
/* Read FIFO status and count */ /* Read FIFO status and count */
for(;;) { for (;; prev_count = count) {
err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, err = read_reg(stir, REG_FIFOCTL, stir->fifo_status,
FIFO_REGS_SIZE); FIFO_REGS_SIZE);
if (unlikely(err != FIFO_REGS_SIZE)) { if (unlikely(err != FIFO_REGS_SIZE)) {
@@ -629,6 +627,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
if (space >= 0 && STIR_FIFO_SIZE - 4 > space + count) if (space >= 0 && STIR_FIFO_SIZE - 4 > space + count)
return 0; return 0;
/* queue confused */
if (prev_count < count)
break;
/* estimate transfer time for remaining chars */ /* estimate transfer time for remaining chars */
msleep((count * 8000) / stir->speed); msleep((count * 8000) / stir->speed);
} }