[PATCH] kfree cleanup: drivers/isdn

This is the drivers/isdn/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/isdn/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index db9bad2b3d165cec9aab180cbe50bdd5697651dc..27391c32f3ebbe3e7a04be2a8609ae30e45d1fbf 100644 (file)
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -212,11 +212,8 @@ static void avmcs_detach(dev_link_t *link)
     
     /* Unlink device structure, free pieces */
     *linkp = link->next;
-    if (link->priv) {
-       kfree(link->priv);
-    }
+    kfree(link->priv);
     kfree(link);
-    
 } /* avmcs_detach */
 
 /*======================================================================

diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 625799ab0d14d5292c96d3c41e01c90148e55567..5d8ee7368f7b79828abc89ec32b9e64724417bc9 100644 (file)
--- 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) {

diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 0e22991635e7510ddd6f91f6fcd090ca213bce4a..5f5a5ae740d2aa9a2afb83b26a0f5075dc94538f 100644 (file)
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -236,9 +236,7 @@ static void avma1cs_detach(dev_link_t *link)
     
     /* Unlink device structure, free pieces */
     *linkp = link->next;
-    if (link->priv) {
-       kfree(link->priv);
-    }
+    kfree(link->priv);
     kfree(link);
     
 } /* avma1cs_detach */

diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index fbaab4352902621d183b318353c89460746a1d56..8159bcecd0c2e1c6fabe01a6dbbe13fbb2d86024 100644 (file)
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -787,8 +787,7 @@ static void ll_unload(struct IsdnCardState *cs)
        ic.command = ISDN_STAT_UNLOAD;
        ic.driver = cs->myid;
        cs->iif.statcallb(&ic);
-       if (cs->status_buf)
-               kfree(cs->status_buf);
+       kfree(cs->status_buf);
        cs->status_read = NULL;
        cs->status_write = NULL;
        cs->status_end = NULL;
@@ -807,10 +806,8 @@ static void closecard(int cardnr)
 
        skb_queue_purge(&csta->rq);
        skb_queue_purge(&csta->sq);
-       if (csta->rcvbuf) {
-               kfree(csta->rcvbuf);
-               csta->rcvbuf = NULL;
-       }
+       kfree(csta->rcvbuf);
+       csta->rcvbuf = NULL;
        if (csta->tx_skb) {
                dev_kfree_skb(csta->tx_skb);
                csta->tx_skb = NULL;

diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 7cf87793e7907d5bdf4d354a1fc4011cce151ad6..637a261c93122a5929d3459e6d4a9e346b32b16e 100644 (file)
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1052,18 +1052,12 @@ init2bds0(struct IsdnCardState *cs)
 void
 release2bds0(struct IsdnCardState *cs)
 {
-       if (cs->bcs[0].hw.hfc.send) {
-               kfree(cs->bcs[0].hw.hfc.send);
-               cs->bcs[0].hw.hfc.send = NULL;
-       }
-       if (cs->bcs[1].hw.hfc.send) {
-               kfree(cs->bcs[1].hw.hfc.send);
-               cs->bcs[1].hw.hfc.send = NULL;
-       }
-       if (cs->hw.hfcD.send) {
-               kfree(cs->hw.hfcD.send);
-               cs->hw.hfcD.send = NULL;
-       }
+       kfree(cs->bcs[0].hw.hfc.send);
+       cs->bcs[0].hw.hfc.send = NULL;
+       kfree(cs->bcs[1].hw.hfc.send);
+       cs->bcs[1].hw.hfc.send = NULL;
+       kfree(cs->hw.hfcD.send);
+       cs->hw.hfcD.send = NULL;
 }
 
 void

diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index f978a5af866292489ceb58b267219c5a3b86b32e..c964539cc43e537daa1fe135dbd66afa22da2117 100644 (file)
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -582,12 +582,8 @@ inithfc(struct IsdnCardState *cs)
 void
 releasehfc(struct IsdnCardState *cs)
 {
-       if (cs->bcs[0].hw.hfc.send) {
-               kfree(cs->bcs[0].hw.hfc.send);
-               cs->bcs[0].hw.hfc.send = NULL;
-       }
-       if (cs->bcs[1].hw.hfc.send) {
-               kfree(cs->bcs[1].hw.hfc.send);
-               cs->bcs[1].hw.hfc.send = NULL;
-       }
+       kfree(cs->bcs[0].hw.hfc.send);
+       cs->bcs[0].hw.hfc.send = NULL;
+       kfree(cs->bcs[1].hw.hfc.send);
+       cs->bcs[1].hw.hfc.send = NULL;
 }

diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
index 66dbaee77bfbd005ecd5db41b32e4cd459bec8c3..c8f9951f7914a4c8d1e387544c3d5bbab4a1cd8f 100644 (file)
--- a/drivers/isdn/hisax/hscx.c
+++ b/drivers/isdn/hisax/hscx.c
@@ -156,14 +156,10 @@ close_hscxstate(struct BCState *bcs)
 {
        modehscx(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) {

diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index b4ca5859b1777cb1e99f88f7fb95714644a845ee..c615752b96aa21b3fb55db5be71e4df42963b3d9 100644 (file)
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -571,14 +571,10 @@ setstack_icc(struct PStack *st, struct IsdnCardState *cs)
 
 static void
 DC_Close_icc(struct IsdnCardState *cs) {
-       if (cs->dc.icc.mon_rx) {
-               kfree(cs->dc.icc.mon_rx);
-               cs->dc.icc.mon_rx = NULL;
-       }
-       if (cs->dc.icc.mon_tx) {
-               kfree(cs->dc.icc.mon_tx);
-               cs->dc.icc.mon_tx = NULL;
-       }
+       kfree(cs->dc.icc.mon_rx);
+       cs->dc.icc.mon_rx = NULL;
+       kfree(cs->dc.icc.mon_tx);
+       cs->dc.icc.mon_tx = NULL;
 }
 
 static void

diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index efba2f44801797f726f30c6033b14dfc3d65611a..2e9afae1254a1a42731936e7e68ef6e1d95cda8a 100644 (file)
--- 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) {

diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 85e063a08d23e3410215e8c519a729b59a5352de..565b7892c2672780dc31d773e8d5a492b37a6229 100644 (file)
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -570,15 +570,12 @@ setstack_isac(struct PStack *st, struct IsdnCardState *cs)
 }
 
 static void
-DC_Close_isac(struct IsdnCardState *cs) {
-       if (cs->dc.isac.mon_rx) {
-               kfree(cs->dc.isac.mon_rx);
-               cs->dc.isac.mon_rx = NULL;
-       }
-       if (cs->dc.isac.mon_tx) {
-               kfree(cs->dc.isac.mon_tx);
-               cs->dc.isac.mon_tx = NULL;
-       }
+DC_Close_isac(struct IsdnCardState *cs)
+{
+       kfree(cs->dc.isac.mon_rx);
+       cs->dc.isac.mon_rx = NULL;
+       kfree(cs->dc.isac.mon_tx);
+       cs->dc.isac.mon_tx = NULL;
 }
 
 static void

diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 642a87c51295c70055509678fa71a370a766f9f2..674af673ff965e9bb48b8e7c2ac9b4452e1607e5 100644 (file)
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -1688,10 +1688,8 @@ close_isarstate(struct BCState *bcs)
 {
        modeisar(bcs, 0, bcs->channel);
        if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-               if (bcs->hw.isar.rcvbuf) {
-                       kfree(bcs->hw.isar.rcvbuf);
-                       bcs->hw.isar.rcvbuf = NULL;
-               }
+               kfree(bcs->hw.isar.rcvbuf);
+               bcs->hw.isar.rcvbuf = NULL;
                skb_queue_purge(&bcs->rqueue);
                skb_queue_purge(&bcs->squeue);
                if (bcs->tx_skb) {

diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 363ae3179bbde9a255148c56c5e90a5e6d0eaf81..2659fecc26747a470ef2f099c1a98aab84dd23a0 100644 (file)
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -195,14 +195,10 @@ close_jadestate(struct BCState *bcs)
 {
     modejade(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) {

diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 94da03c30c51507c1af9c74d449e04930a4a3c52..47a47ef0968bf3d0abaf612fdfd58598187b94c8 100644 (file)
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -855,14 +855,10 @@ close_tigerstate(struct BCState *bcs)
 {
        mode_tiger(bcs, 0, bcs->channel);
        if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-               if (bcs->hw.tiger.rcvbuf) {
-                       kfree(bcs->hw.tiger.rcvbuf);
-                       bcs->hw.tiger.rcvbuf = NULL;
-               }
-               if (bcs->hw.tiger.sendbuf) {
-                       kfree(bcs->hw.tiger.sendbuf);
-                       bcs->hw.tiger.sendbuf = NULL;
-               }
+               kfree(bcs->hw.tiger.rcvbuf);
+               bcs->hw.tiger.rcvbuf = NULL;
+               kfree(bcs->hw.tiger.sendbuf);
+               bcs->hw.tiger.sendbuf = NULL;
                skb_queue_purge(&bcs->rqueue);
                skb_queue_purge(&bcs->squeue);
                if (bcs->tx_skb) {
@@ -967,20 +963,12 @@ inittiger(struct IsdnCardState *cs)
 static void
 releasetiger(struct IsdnCardState *cs)
 {
-       if (cs->bcs[0].hw.tiger.send) {
-               kfree(cs->bcs[0].hw.tiger.send);
-               cs->bcs[0].hw.tiger.send = NULL;
-       }
-       if (cs->bcs[1].hw.tiger.send) {
-               cs->bcs[1].hw.tiger.send = NULL;
-       }
-       if (cs->bcs[0].hw.tiger.rec) {
-               kfree(cs->bcs[0].hw.tiger.rec);
-               cs->bcs[0].hw.tiger.rec = NULL;
-       }
-       if (cs->bcs[1].hw.tiger.rec) {
-               cs->bcs[1].hw.tiger.rec = NULL;
-       }
+       kfree(cs->bcs[0].hw.tiger.send);
+       cs->bcs[0].hw.tiger.send = NULL;
+       cs->bcs[1].hw.tiger.send = NULL;
+       kfree(cs->bcs[0].hw.tiger.rec);
+       cs->bcs[0].hw.tiger.rec = NULL;
+       cs->bcs[1].hw.tiger.rec = NULL;
 }
 
 void

diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 89fbeb58485de92d158631bf69822d314176a9c4..b096b64b0253cd2e95806356d698d128af5b2b2b 100644 (file)
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -335,14 +335,12 @@ void st5481_release_usb(struct st5481_adapter *adapter)
 
        // Stop and free Control and Interrupt URBs
        usb_kill_urb(ctrl->urb);
-       if (ctrl->urb->transfer_buffer)
-               kfree(ctrl->urb->transfer_buffer);
+       kfree(ctrl->urb->transfer_buffer);
        usb_free_urb(ctrl->urb);
        ctrl->urb = NULL;
 
        usb_kill_urb(intr->urb);
-       if (intr->urb->transfer_buffer)
-               kfree(intr->urb->transfer_buffer);
+       kfree(intr->urb->transfer_buffer);
        usb_free_urb(intr->urb);
        ctrl->urb = NULL;
 }
@@ -457,8 +455,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
  err:
        for (j = 0; j < 2; j++) {
                if (urb[j]) {
-                       if (urb[j]->transfer_buffer)
-                               kfree(urb[j]->transfer_buffer);
+                       kfree(urb[j]->transfer_buffer);
                        urb[j]->transfer_buffer = NULL;
                        usb_free_urb(urb[j]);
                        urb[j] = NULL;
@@ -473,8 +470,7 @@ void st5481_release_isocpipes(struct urb* urb[2])
 
        for (j = 0; j < 2; j++) {
                usb_kill_urb(urb[j]);
-               if (urb[j]->transfer_buffer)
-                       kfree(urb[j]->transfer_buffer);                 
+               kfree(urb[j]->transfer_buffer);
                usb_free_urb(urb[j]);
                urb[j] = NULL;
        }

diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index 7baf8e4884716080266b3eb3df37a7d41152da41..0352ee5f706ca904244839b102edb84746ca580a 100644 (file)
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -819,14 +819,10 @@ close_w6692state(struct BCState *bcs)
 {
        W6692Bmode(bcs, 0, bcs->channel);
        if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
-               if (bcs->hw.w6692.rcvbuf) {
-                       kfree(bcs->hw.w6692.rcvbuf);
-                       bcs->hw.w6692.rcvbuf = NULL;
-               }
-               if (bcs->blog) {
-                       kfree(bcs->blog);
-                       bcs->blog = NULL;
-               }
+               kfree(bcs->hw.w6692.rcvbuf);
+               bcs->hw.w6692.rcvbuf = NULL;
+               kfree(bcs->blog);
+               bcs->blog = NULL;
                skb_queue_purge(&bcs->rqueue);
                skb_queue_purge(&bcs->squeue);
                if (bcs->tx_skb) {

diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 639582f61f41e416e98dbb493a70a9a3d1f7df15..87f59a0e2a959cbabd23ded727e53949dc49eb75 100644 (file)
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -359,8 +359,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
        } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) {
                /* read access -> output card info data */
 
-               if (filep->private_data)
-                       kfree(filep->private_data);     /* release memory */
+               kfree(filep->private_data);     /* release memory */
        }
        unlock_kernel();
        return (retval);

diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index d97a9be5469c45deb6f8d5965a3a84125c446314..1a19a0f894288907c30ea2fbb91790db3d67a584 100644 (file)
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -364,10 +364,8 @@ isdn_ppp_release(int min, struct file *file)
                isdn_net_hangup(&p->dev);
        }
        for (i = 0; i < NUM_RCV_BUFFS; i++) {
-               if (is->rq[i].buf) {
-                       kfree(is->rq[i].buf);
-                       is->rq[i].buf = NULL;
-               }
+               kfree(is->rq[i].buf);
+               is->rq[i].buf = NULL;
        }
        is->first = is->rq + NUM_RCV_BUFFS - 1; /* receive queue */
        is->last = is->rq;
@@ -378,14 +376,10 @@ isdn_ppp_release(int min, struct file *file)
        is->slcomp = NULL;
 #endif
 #ifdef CONFIG_IPPP_FILTER
-       if (is->pass_filter) {
-               kfree(is->pass_filter);
-               is->pass_filter = NULL;
-       }
-       if (is->active_filter) {
-               kfree(is->active_filter);
-               is->active_filter = NULL;
-       }
+       kfree(is->pass_filter);
+       is->pass_filter = NULL;
+       kfree(is->active_filter);
+       is->active_filter = NULL;
 #endif
 
 /* TODO: if this was the previous master: link the stuff to the new master */
@@ -914,8 +908,7 @@ isdn_ppp_cleanup(void)
                kfree(ippp_table[i]);
 
 #ifdef CONFIG_ISDN_MPP
-       if (isdn_ppp_bundle_arr)
-               kfree(isdn_ppp_bundle_arr);
+       kfree(isdn_ppp_bundle_arr);
 #endif /* CONFIG_ISDN_MPP */
 
 }

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 356ee485be4bef8e9e33f19a16e74ef5aa0facf2..8c404b4e2482d4769a263514faa9b68eb05ca4e6 100644 (file)
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -712,22 +712,14 @@ isdn_tty_modem_hup(modem_info * info, int local)
 #endif
        info->emu.vpar[4] = 0;
        info->emu.vpar[5] = 8;
-       if (info->dtmf_state) {
-               kfree(info->dtmf_state);
-               info->dtmf_state = NULL;
-       }
-       if (info->silence_state) {
-               kfree(info->silence_state);
-               info->silence_state = NULL;
-       }
-       if (info->adpcms) {
-               kfree(info->adpcms);
-               info->adpcms = NULL;
-       }
-       if (info->adpcmr) {
-               kfree(info->adpcmr);
-               info->adpcmr = NULL;
-       }
+       kfree(info->dtmf_state);
+       info->dtmf_state = NULL;
+       kfree(info->silence_state);
+       info->silence_state = NULL;
+       kfree(info->adpcms);
+       info->adpcms = NULL;
+       kfree(info->adpcmr);
+       info->adpcmr = NULL;
 #endif
        if ((info->msr & UART_MSR_RI) &&
                (info->emu.mdmreg[REG_RUNG] & BIT_RUNG))

diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 5de861f4081605ec66d0c375291dda166c8bae80..94f21486bb24d667b4c22b29e2c507e30262919b 100644 (file)
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -561,10 +561,8 @@ void pcbit_l3_receive(struct pcbit_dev * dev, ulong msg,
                else
                        pcbit_fsm_event(dev, chan, EV_USR_RELEASE_REQ, NULL);
 
-               if (cbdata.data.setup.CalledPN)
-                       kfree(cbdata.data.setup.CalledPN);
-               if (cbdata.data.setup.CallingPN)
-                       kfree(cbdata.data.setup.CallingPN);
+               kfree(cbdata.data.setup.CalledPN);
+               kfree(cbdata.data.setup.CallingPN);
                break;
     
        case MSG_CONN_CONF: