From 31dfed88c582b9a73e8e2f3540964309f319b21f Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Thu, 11 Sep 2008 20:59:03 +0200
Subject: [PATCH] --- yaml --- r: 151471 b: refs/heads/master c:
 96c25c81ecf452b778e2f432bd17c95de637d129 h: refs/heads/master i:   151469:
 fe969bf23eb2db7423d3a382aa804562308af71b   151467:
 cc8ea4ed0b3609f9d52c6e711e8fab0813883555   151463:
 50f9bd8f5adc097769fc90047bf032e248627d94   151455:
 b1ba93dad8d3edbf057da2d08cb8d3e5fffee261 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ieee1394/csr1212.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4fc2705a1afe..e07eacba995e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 004cdb5a718fa2bb697c541eb1171ee817fc72f1
+refs/heads/master: 96c25c81ecf452b778e2f432bd17c95de637d129
diff --git a/trunk/drivers/ieee1394/csr1212.c b/trunk/drivers/ieee1394/csr1212.c
index a6dfeb0b3372..e76cac64c533 100644
--- a/trunk/drivers/ieee1394/csr1212.c
+++ b/trunk/drivers/ieee1394/csr1212.c
@@ -35,6 +35,7 @@
 
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/kmemcheck.h>
 #include <linux/string.h>
 #include <asm/bug.h>
 #include <asm/byteorder.h>
@@ -387,6 +388,7 @@ csr1212_new_descriptor_leaf(u8 dtype, u32 specifier_id,
 	if (!kv)
 		return NULL;
 
+	kmemcheck_annotate_variable(kv->value.leaf.data[0]);
 	CSR1212_DESCRIPTOR_LEAF_SET_TYPE(kv, dtype);
 	CSR1212_DESCRIPTOR_LEAF_SET_SPECIFIER_ID(kv, specifier_id);