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

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

diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c
index 8303fe3ebf891e820439c8359518022fe8c29a54..797c8d165993f556b954b6c7aea9fd31540adbe0 100644 (file)
--- a/net/caif/cfserl.c
+++ b/net/caif/cfserl.c
@@ -33,13 +33,10 @@ static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 
 struct cflayer *cfserl_create(int type, int instance, bool use_stx)
 {
-       struct cfserl *this = kmalloc(sizeof(struct cfserl), GFP_ATOMIC);
-       if (!this) {
-               pr_warn("Out of memory\n");
+       struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC);
+       if (!this)
                return NULL;
-       }
        caif_assert(offsetof(struct cfserl, layer) == 0);
-       memset(this, 0, sizeof(struct cfserl));
        this->layer.receive = cfserl_receive;
        this->layer.transmit = cfserl_transmit;
        this->layer.ctrlcmd = cfserl_ctrlcmd;
@@ -179,15 +176,10 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt)
 static int cfserl_transmit(struct cflayer *layer, struct cfpkt *newpkt)
 {
        struct cfserl *layr = container_obj(layer);
-       int ret;
        u8 tmp8 = CFSERL_STX;
        if (layr->usestx)
                cfpkt_add_head(newpkt, &tmp8, 1);
-       ret = layer->dn->transmit(layer->dn, newpkt);
-       if (ret < 0)
-               cfpkt_extr_head(newpkt, &tmp8, 1);
-
-       return ret;
+       return layer->dn->transmit(layer->dn, newpkt);
 }
 
 static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,