Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c
index ba02db0..5cd44f0 100644 (file)
--- a/net/caif/caif_usb.c
+++ b/net/caif/caif_usb.c
@@ -87,13 +87,12 @@ static struct cflayer *cfusbl_create(int phyid, u8 ethaddr[ETH_ALEN],
 {
        struct cfusbl *this = kmalloc(sizeof(struct cfusbl), GFP_ATOMIC);
 
-       if (!this) {
-               pr_warn("Out of memory\n");
+       if (!this)
                return NULL;
-       }
+
        caif_assert(offsetof(struct cfusbl, layer) == 0);
 
-       memset(this, 0, sizeof(struct cflayer));
+       memset(&this->layer, 0, sizeof(this->layer));
        this->layer.receive = cfusbl_receive;
        this->layer.transmit = cfusbl_transmit;
        this->layer.ctrlcmd = cfusbl_ctrlcmd;