From a244895ba7647f5dd5f15f8eafe180973190fdcb Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 25 Feb 2009 18:26:33 +0800 Subject: [PATCH] --- yaml --- r: 141779 b: refs/heads/master c: 0773a5c07641ddef7f94636292921e12f2efab02 h: refs/heads/master i: 141777: d8cadc95fd66b06c8c66b3f622112fcc4e6fede1 141775: 6d7b1ff4ecd35aa646c35cb4f6d5e235bf3a268d v: v3 --- [refs] | 2 +- trunk/drivers/staging/at76_usb/at76_usb.c | 3 +-- trunk/drivers/staging/otus/wwrap.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bd9688cf80e8..c74b6e7647c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbe364ddedd84ee5a4bec65fa0ca56caf09d6802 +refs/heads/master: 0773a5c07641ddef7f94636292921e12f2efab02 diff --git a/trunk/drivers/staging/at76_usb/at76_usb.c b/trunk/drivers/staging/at76_usb/at76_usb.c index 1d8eaf8171e1..6f6e36a3bd9f 100644 --- a/trunk/drivers/staging/at76_usb/at76_usb.c +++ b/trunk/drivers/staging/at76_usb/at76_usb.c @@ -5370,8 +5370,7 @@ static void at76_delete_device(struct at76_priv *priv) at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__); - if (priv->rx_skb) - kfree_skb(priv->rx_skb); + kfree_skb(priv->rx_skb); at76_free_bss_list(priv); del_timer_sync(&priv->bss_list_timer); diff --git a/trunk/drivers/staging/otus/wwrap.c b/trunk/drivers/staging/otus/wwrap.c index 1bb5f596d6c3..a0b1e0b452db 100644 --- a/trunk/drivers/staging/otus/wwrap.c +++ b/trunk/drivers/staging/otus/wwrap.c @@ -971,8 +971,7 @@ int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len) out: return ret; nlmsg_failure: /*NLMSG_PUT ʧ°Ü£¬Ôò³·ÏúÌ×½Ó×Ö»º´æ*/ - if(skb) - kfree_skb(skb); + kfree_skb(skb); goto out; #undef COMMTYPE_GROUP