diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/staging/otus/wwrap.c | |
parent | integrity: remove __setup auditing msgs (diff) | |
parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
download | linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.zip |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/otus/wwrap.c')
-rw-r--r-- | drivers/staging/otus/wwrap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index 1bb5f596d6c3..4db8f6e75ad8 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c @@ -350,8 +350,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb) buf->len = 0; #endif - if ((buf->tail + urb->actual_length) > buf->end) - BUG(); + BUG_ON((buf->tail + urb->actual_length) > buf->end); skb_put(buf, urb->actual_length); @@ -971,8 +970,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 |