summaryrefslogtreecommitdiff
path: root/drivers/isdn/hisax/isdnl1.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-07-13 22:09:23 (GMT)
committerAnton Altaparmakov <aia21@cantab.net>2005-07-13 22:09:23 (GMT)
commitc514720716c7b109ff980f8b3cb93f9af872c91c (patch)
tree490a9578995705de69712893a190b67651bddc56 /drivers/isdn/hisax/isdnl1.c
parent07929dcb963786512c760dd3ecd148d89295e7e5 (diff)
parent1e279dd855d15b72364b4103f872d67d8592647e (diff)
downloadlinux-fsl-qoriq-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/isdn/hisax/isdnl1.c')
-rw-r--r--drivers/isdn/hisax/isdnl1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index ac89950..bab3568 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -279,7 +279,8 @@ BChannel_proc_xmt(struct BCState *bcs)
if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags))
st->l1.l1l2(st, PH_PULL | CONFIRM, NULL);
if (!test_bit(BC_FLG_ACTIV, &bcs->Flag)) {
- if (!test_bit(BC_FLG_BUSY, &bcs->Flag) && (!skb_queue_len(&bcs->squeue))) {
+ if (!test_bit(BC_FLG_BUSY, &bcs->Flag) &&
+ skb_queue_empty(&bcs->squeue)) {
st->l2.l2l1(st, PH_DEACTIVATE | CONFIRM, NULL);
}
}