Merge remote-tracking branch 'scsi/for-next'

[deliverable/linux.git] / drivers / scsi / esas2r / esas2r_main.c

diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 2aca4d16f39eba873df26e469c929f6bb0a5140a..5092c821d0887d09c23679bde31e1295eb71d518 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -194,7 +194,7 @@ static ssize_t write_hw(struct file *file, struct kobject *kobj,
        int length = min(sizeof(struct atto_ioctl), count);
 
        if (!a->local_atto_ioctl) {
-               a->local_atto_ioctl = kzalloc(sizeof(struct atto_ioctl),
+               a->local_atto_ioctl = kmalloc(sizeof(struct atto_ioctl),
                                              GFP_KERNEL);
                if (a->local_atto_ioctl == NULL) {
                        esas2r_log(ESAS2R_LOG_WARN,