Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d46604e1 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

isdn: remove some pointless conditionals before kfree_skb() 



Remove some pointless conditionals before kfree_skb().

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e44578ea

drivers/isdn/capi/capi.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void capiminor_free(struct capiminor *mp) 
	list_del(&mp->list);

	write_unlock_irqrestore(&capiminor_list_lock, flags);



	if (mp->ttyskb) kfree_skb(mp->ttyskb);

	kfree_skb(mp->ttyskb);

	mp->ttyskb = NULL;

	skb_queue_purge(&mp->inqueue);

	skb_queue_purge(&mp->outqueue);

drivers/isdn/pcbit/layer2.c

+2 −4
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ pcbit_receive(struct pcbit_dev *dev) 
		if (dev->read_frame) {

			printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n");

			/* discard previous queued frame */

			if (dev->read_frame->skb)

			kfree_skb(dev->read_frame->skb);

			kfree(dev->read_frame);

			dev->read_frame = NULL;
@@ -601,7 +600,6 @@ pcbit_l2_err_recover(unsigned long data) 
	dev->w_busy = dev->r_busy = 1;



	if (dev->read_frame) {

		if (dev->read_frame->skb)

		kfree_skb(dev->read_frame->skb);

		kfree(dev->read_frame);

		dev->read_frame = NULL;