From fed762f5cafab6bdea4be7d062c71debad2807ae Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 29 Nov 2011 22:08:00 +0100
Subject: [PATCH] --- yaml --- r: 293535 b: refs/heads/master c:
 493dea2876df144ec57a6a9efbe55db43c7a729e h: refs/heads/master i:   293533:
 9d3f11214be4975ef75788903950b1dd715d4d22   293531:
 e2a828ad12901d01e7ef363faf7647674dcded4c   293527:
 cb8365a4580ae83d26cd1c644469a0409dd835c2   293519:
 2008449bb48f412d0c5a3935bc193c7dc2a46fbb   293503:
 f9b1b15ddb15c7729753e1c2bfa93518d15e8746 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i915/intel_bios.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7bb5fa6c4a78..82c263a3636b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e96feab83d29e27d14c60f1fa7c716ef7880cd
+refs/heads/master: 493dea2876df144ec57a6a9efbe55db43c7a729e
diff --git a/trunk/drivers/gpu/drm/i915/intel_bios.c b/trunk/drivers/gpu/drm/i915/intel_bios.c
index 63880e2e5cfd..50656339d922 100644
--- a/trunk/drivers/gpu/drm/i915/intel_bios.c
+++ b/trunk/drivers/gpu/drm/i915/intel_bios.c
@@ -572,7 +572,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
 		DRM_DEBUG_KMS("no child dev is parsed from VBT\n");
 		return;
 	}
-	dev_priv->child_dev = kzalloc(sizeof(*p_child) * count, GFP_KERNEL);
+	dev_priv->child_dev = kcalloc(count, sizeof(*p_child), GFP_KERNEL);
 	if (!dev_priv->child_dev) {
 		DRM_DEBUG_KMS("No memory space for child device\n");
 		return;