Merge ../linux-2.6

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index efba2f448017..2e9afae1254a 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -762,14 +762,10 @@ bch_close_state(struct BCState *bcs)
 {
         bch_mode(bcs, 0, bcs->channel);
         if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-                if (bcs->hw.hscx.rcvbuf) {
-                        kfree(bcs->hw.hscx.rcvbuf);
-                        bcs->hw.hscx.rcvbuf = NULL;
-                }
-                if (bcs->blog) {
-                        kfree(bcs->blog);
-                        bcs->blog = NULL;
-                }
+                kfree(bcs->hw.hscx.rcvbuf);
+                bcs->hw.hscx.rcvbuf = NULL;
+                kfree(bcs->blog);
+                bcs->blog = NULL;
                 skb_queue_purge(&bcs->rqueue);
                 skb_queue_purge(&bcs->squeue);
                 if (bcs->tx_skb) {