From 91e47d480108742e5bb8729eb720b98a282a9f42 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 29 Oct 2012 08:25:00 +0000
Subject: [PATCH] --- yaml --- r: 337586 b: refs/heads/master c:
 6b3aa3131a7804640e7589e5629036f660362f0b h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/iio/adc/at91_adc.c | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0481622c4f95..704c3b9629fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b0c856ad9571013db8fc369194b7108dff3c18e
+refs/heads/master: 6b3aa3131a7804640e7589e5629036f660362f0b
diff --git a/trunk/drivers/iio/adc/at91_adc.c b/trunk/drivers/iio/adc/at91_adc.c
index a9176722042f..2e2c9a80aa37 100644
--- a/trunk/drivers/iio/adc/at91_adc.c
+++ b/trunk/drivers/iio/adc/at91_adc.c
@@ -123,8 +123,10 @@ static int at91_adc_channel_init(struct iio_dev *idev)
 	idev->num_channels = bitmap_weight(&st->channels_mask,
 					   st->num_channels) + 1;
 
-	chan_array = devm_kcalloc(&idev->dev, idev->num_channels + 1,
-					sizeof(*chan_array), GFP_KERNEL);
+	chan_array = devm_kzalloc(&idev->dev,
+				  ((idev->num_channels + 1) *
+					sizeof(struct iio_chan_spec)),
+				  GFP_KERNEL);
 
 	if (!chan_array)
 		return -ENOMEM;
@@ -268,8 +270,9 @@ static int at91_adc_trigger_init(struct iio_dev *idev)
 	struct at91_adc_state *st = iio_priv(idev);
 	int i, ret;
 
-	st->trig = devm_kcalloc(&idev->dev, st->trigger_number,
-				sizeof(*st->trig), GFP_KERNEL);
+	st->trig = devm_kzalloc(&idev->dev,
+				st->trigger_number * sizeof(st->trig),
+				GFP_KERNEL);
 
 	if (st->trig == NULL) {
 		ret = -ENOMEM;
@@ -451,8 +454,9 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
 	st->registers->trigger_register = prop;
 
 	st->trigger_number = of_get_child_count(node);
-	st->trigger_list = devm_kcalloc(&idev->dev, st->trigger_number,
-					sizeof(*st->trigger_list), GFP_KERNEL);
+	st->trigger_list = devm_kzalloc(&idev->dev, st->trigger_number *
+					sizeof(struct at91_adc_trigger),
+					GFP_KERNEL);
 	if (!st->trigger_list) {
 		dev_err(&idev->dev, "Could not allocate trigger list memory.\n");
 		ret = -ENOMEM;