aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2009-02-25 05:26:33 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:26 -0400
commit0773a5c07641ddef7f94636292921e12f2efab02 (patch)
tree2a370e53136449fb5f8893c1db204e97a58733e5
parentbbe364ddedd84ee5a4bec65fa0ca56caf09d6802 (diff)
Staging: 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: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/at76_usb/at76_usb.c3
-rw-r--r--drivers/staging/otus/wwrap.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index 1d8eaf8171e1..6f6e36a3bd9f 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -5370,8 +5370,7 @@ static void at76_delete_device(struct at76_priv *priv)
5370 5370
5371 at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__); 5371 at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__);
5372 5372
5373 if (priv->rx_skb) 5373 kfree_skb(priv->rx_skb);
5374 kfree_skb(priv->rx_skb);
5375 5374
5376 at76_free_bss_list(priv); 5375 at76_free_bss_list(priv);
5377 del_timer_sync(&priv->bss_list_timer); 5376 del_timer_sync(&priv->bss_list_timer);
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c
index 1bb5f596d6c3..a0b1e0b452db 100644
--- a/drivers/staging/otus/wwrap.c
+++ b/drivers/staging/otus/wwrap.c
@@ -971,8 +971,7 @@ int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len)
971out: 971out:
972 return ret; 972 return ret;
973nlmsg_failure: /*NLMSG_PUT ʧ°Ü£¬Ôò³·ÏúÌ×½Ó×Ö»º´æ*/ 973nlmsg_failure: /*NLMSG_PUT ʧ°Ü£¬Ôò³·ÏúÌ×½Ó×Ö»º´æ*/
974 if(skb) 974 kfree_skb(skb);
975 kfree_skb(skb);
976 goto out; 975 goto out;
977 976
978#undef COMMTYPE_GROUP 977#undef COMMTYPE_GROUP