diff options
| author | jdixon <jdixon@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-23 04:36:22 +0000 |
|---|---|---|
| committer | jdixon <jdixon@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-23 04:36:22 +0000 |
| commit | a1a3960d9980f7fb4271de680e2439d1917290de (patch) | |
| tree | 172894fd64ba4b9127ba748ce0b6b5c3f69f1f7f | |
| parent | 4fe2881da4034c802093f4e6e0a0b1edb8a28a03 (diff) | |
Updated to latest code, fixed bug in serial i/o
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4191 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | kernel/pciradio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/pciradio.c b/kernel/pciradio.c index 55270c1..f342859 100644 --- a/kernel/pciradio.c +++ b/kernel/pciradio.c @@ -1355,8 +1355,9 @@ static int pciradio_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long stack.p.index = rad->rxindex; break; } - /* wait for done only if in SERIAL_ASCII mode */ - if (rad->remmode[chan->chanpos - 1] == ZT_RADPAR_REM_SERIAL_ASCII) + /* wait for done if in SERIAL_ASCII mode, or if no Rx aftwards */ + if ((rad->remmode[chan->chanpos - 1] == ZT_RADPAR_REM_SERIAL_ASCII) || + (!stack.p.data)) { /* wait for TX to be done if not already */ while(rad->txlen && (rad->txindex < rad->txlen)) |