aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2009-02-24 19:12:09 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-27 02:07:29 -0500
commitd46604e178f01305e63564864517926bb752d4a3 (patch)
treef13a4eae40dc7ef6b84f72efebb2af636063b53a
parente44578ea7c4f87462e05e0d0a2dd43b6beecd5f6 (diff)
isdn: remove some pointless conditionals before kfree_skb()
Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/isdn/capi/capi.c2
-rw-r--r--drivers/isdn/pcbit/layer2.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 1b5bf87c4cf4..3e468d2cf730 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -277,7 +277,7 @@ static void capiminor_free(struct capiminor *mp)
277 list_del(&mp->list); 277 list_del(&mp->list);
278 write_unlock_irqrestore(&capiminor_list_lock, flags); 278 write_unlock_irqrestore(&capiminor_list_lock, flags);
279 279
280 if (mp->ttyskb) kfree_skb(mp->ttyskb); 280 kfree_skb(mp->ttyskb);
281 mp->ttyskb = NULL; 281 mp->ttyskb = NULL;
282 skb_queue_purge(&mp->inqueue); 282 skb_queue_purge(&mp->inqueue);
283 skb_queue_purge(&mp->outqueue); 283 skb_queue_purge(&mp->outqueue);
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 5ba2a879df14..e075e8d2fce0 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -347,8 +347,7 @@ pcbit_receive(struct pcbit_dev *dev)
347 if (dev->read_frame) { 347 if (dev->read_frame) {
348 printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n"); 348 printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n");
349 /* discard previous queued frame */ 349 /* discard previous queued frame */
350 if (dev->read_frame->skb) 350 kfree_skb(dev->read_frame->skb);
351 kfree_skb(dev->read_frame->skb);
352 kfree(dev->read_frame); 351 kfree(dev->read_frame);
353 dev->read_frame = NULL; 352 dev->read_frame = NULL;
354 } 353 }
@@ -601,8 +600,7 @@ pcbit_l2_err_recover(unsigned long data)
601 dev->w_busy = dev->r_busy = 1; 600 dev->w_busy = dev->r_busy = 1;
602 601
603 if (dev->read_frame) { 602 if (dev->read_frame) {
604 if (dev->read_frame->skb) 603 kfree_skb(dev->read_frame->skb);
605 kfree_skb(dev->read_frame->skb);
606 kfree(dev->read_frame); 604 kfree(dev->read_frame);
607 dev->read_frame = NULL; 605 dev->read_frame = NULL;
608 } 606 }