diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:37:34 -0500 |
commit | 8006fdd6dc387abaa4b683bda4868c879fd76070 (patch) | |
tree | 314b08f4923dd9ab24930e6b2ac75889c244b154 /drivers/isdn/hisax/avm_pci.c | |
parent | 18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (diff) | |
parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) | |
download | blackbird-op-linux-8006fdd6dc387abaa4b683bda4868c879fd76070.tar.gz blackbird-op-linux-8006fdd6dc387abaa4b683bda4868c879fd76070.zip |
Merge branch 'upstream'
Diffstat (limited to 'drivers/isdn/hisax/avm_pci.c')
-rw-r--r-- | drivers/isdn/hisax/avm_pci.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 625799ab0d14..5d8ee7368f7b 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -552,14 +552,10 @@ close_hdlcstate(struct BCState *bcs) { modehdlc(bcs, 0, 0); if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { - if (bcs->hw.hdlc.rcvbuf) { - kfree(bcs->hw.hdlc.rcvbuf); - bcs->hw.hdlc.rcvbuf = NULL; - } - if (bcs->blog) { - kfree(bcs->blog); - bcs->blog = NULL; - } + kfree(bcs->hw.hdlc.rcvbuf); + bcs->hw.hdlc.rcvbuf = NULL; + kfree(bcs->blog); + bcs->blog = NULL; skb_queue_purge(&bcs->rqueue); skb_queue_purge(&bcs->squeue); if (bcs->tx_skb) { |