Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / net / caif / cfdgml.c

diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c
index 0382dec84fdc31591cf8cfa19316a6aeafbe2b9c..0f5ff27aa41ca133550d5bb3ed7ec160d6c2a586 100644 (file)
--- a/net/caif/cfdgml.c
+++ b/net/caif/cfdgml.c
@@ -26,13 +26,10 @@ static int cfdgml_transmit(struct cflayer *layr, struct cfpkt *pkt);
 
 struct cflayer *cfdgml_create(u8 channel_id, struct dev_info *dev_info)
 {
-       struct cfsrvl *dgm = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
-       if (!dgm) {
-               pr_warn("Out of memory\n");
+       struct cfsrvl *dgm = kzalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
+       if (!dgm)
                return NULL;
-       }
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
-       memset(dgm, 0, sizeof(struct cfsrvl));
        cfsrvl_init(dgm, channel_id, dev_info, true);
        dgm->layer.receive = cfdgml_receive;
        dgm->layer.transmit = cfdgml_transmit;