Merge git://git.linux-xtensa.org/kernel/xtensa-feed

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / imm.c

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 0464c182c5771fc44d02a3549bbd19fbd6b8d227..005d2b05f32d2fbbec6dc50b54f0cff850cd2808 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1159,11 +1159,10 @@ static int __imm_attach(struct parport *pb)
 
        init_waitqueue_head(&waiting);
 
-       dev = kmalloc(sizeof(imm_struct), GFP_KERNEL);
+       dev = kzalloc(sizeof(imm_struct), GFP_KERNEL);
        if (!dev)
                return -ENOMEM;
 
-       memset(dev, 0, sizeof(imm_struct));
 
        dev->base = -1;
        dev->mode = IMM_AUTODETECT;