Merge branch 'osd-devel' into nfs-for-next

[cascardo/linux.git] / net / caif / cfvidl.c

diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c
index b2f5989..e3f37db 100644 (file)
--- a/net/caif/cfvidl.c
+++ b/net/caif/cfvidl.c
@@ -21,14 +21,11 @@ static int cfvidl_transmit(struct cflayer *layr, struct cfpkt *pkt);
 
 struct cflayer *cfvidl_create(u8 channel_id, struct dev_info *dev_info)
 {
-       struct cfsrvl *vid = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
-       if (!vid) {
-               pr_warn("Out of memory\n");
+       struct cfsrvl *vid = kzalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
+       if (!vid)
                return NULL;
-       }
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
 
-       memset(vid, 0, sizeof(struct cfsrvl));
        cfsrvl_init(vid, channel_id, dev_info, false);
        vid->layer.receive = cfvidl_receive;
        vid->layer.transmit = cfvidl_transmit;