From 9e064741fdf3786b19d5f71ccf0adee64de51ce9 Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Fri, 25 Nov 2011 16:46:51 -0500
Subject: [PATCH] --- yaml --- r: 276323 b: refs/heads/master c:
 dfd8ee92a9192d78aa38cf8699df3630a7c88c85 h: refs/heads/master i:   276321:
 7219ec681e66e105880b7faeea34f02024957c0f   276319:
 4ee37ee9742b1b913ee65705253158bea15d866f v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/comedi/comedi_fops.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7c36e8848b70..642e8b3bee39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b446c8af5db5a98b2eaa30b513c79089ed254b
+refs/heads/master: dfd8ee92a9192d78aa38cf8699df3630a7c88c85
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index ebdcecda3583..5e78c77d5a08 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -671,7 +671,7 @@ static int do_insnlist_ioctl(struct comedi_device *dev,
 	}
 
 	insns =
-	    kmalloc(sizeof(struct comedi_insn) * insnlist.n_insns, GFP_KERNEL);
+	    kcalloc(insnlist.n_insns, sizeof(struct comedi_insn), GFP_KERNEL);
 	if (!insns) {
 		DPRINTK("kmalloc failed\n");
 		ret = -ENOMEM;