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

[pandora-kernel.git] / drivers / staging / go7007 / go7007-fw.c

diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/go7007/go7007-fw.c
index ee622ff..c9a6409 100644 (file)
--- a/drivers/staging/go7007/go7007-fw.c
+++ b/drivers/staging/go7007/go7007-fw.c
@@ -380,13 +380,12 @@ static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
        unsigned int addr = 0x19;
        int size = 0, i, off = 0, chunk;
 
-       buf = kmalloc(4096, GFP_KERNEL);
+       buf = kzalloc(4096, GFP_KERNEL);
        if (buf == NULL) {
                printk(KERN_ERR "go7007: unable to allocate 4096 bytes for "
                                "firmware construction\n");
                return -1;
        }
-       memset(buf, 0, 4096);
 
        for (i = 1; i < 32; ++i) {
                mjpeg_frame_header(go, buf + size, i);
@@ -651,13 +650,12 @@ static int gen_mpeg1hdr_to_package(struct go7007 *go,
        unsigned int addr = 0x19;
        int i, off = 0, chunk;
 
-       buf = kmalloc(5120, GFP_KERNEL);
+       buf = kzalloc(5120, GFP_KERNEL);
        if (buf == NULL) {
                printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "
                                "firmware construction\n");
                return -1;
        }
-       memset(buf, 0, 5120);
        framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);
        if (go->interlace_coding)
                framelen[0] += mpeg1_frame_header(go, buf + framelen[0] / 8,
@@ -839,13 +837,12 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
        unsigned int addr = 0x19;
        int i, off = 0, chunk;
 
-       buf = kmalloc(5120, GFP_KERNEL);
+       buf = kzalloc(5120, GFP_KERNEL);
        if (buf == NULL) {
                printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "
                                "firmware construction\n");
                return -1;
        }
-       memset(buf, 0, 5120);
        framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);
        i = 368;
        framelen[1] = mpeg4_frame_header(go, buf + i, 0, BFRAME_PRE);
@@ -1585,13 +1582,12 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
                        go->board_info->firmware);
                return -1;
        }
-       code = kmalloc(codespace * 2, GFP_KERNEL);
+       code = kzalloc(codespace * 2, GFP_KERNEL);
        if (code == NULL) {
                printk(KERN_ERR "go7007: unable to allocate %d bytes for "
                                "firmware construction\n", codespace * 2);
                goto fw_failed;
        }
-       memset(code, 0, codespace * 2);
        src = (__le16 *)fw_entry->data;
        srclen = fw_entry->size / 2;
        while (srclen >= 2) {