Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / otus / wwrap.c

diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c
index 1bb5f596d6c36fc939e8444e9888096f3caa0d64..4db8f6e75ad8340f671485f6dafdf390f373b0a9 100644 (file)
--- 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